Rev 1970: merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1970
revision-id: jelmer at samba.org-20081110022227-bqjz3e8fz1p2u9zi
parent: jelmer at samba.org-20081109215556-fn8r4zt9lhjm2ra5
parent: jelmer at samba.org-20081110021154-l9o267vsk25f8tf5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-11-10 03:22:27 +0100
message:
  merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
    ------------------------------------------------------------
    revno: 1669.9.21
    revision-id: jelmer at samba.org-20081110021154-l9o267vsk25f8tf5
    parent: jelmer at samba.org-20081110011000-y0ojz2os3eatv8ri
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-11-10 03:11:54 +0100
    message:
      Start on 0.4.16.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.9.20
    tags: bzr-svn-0.4.15
    revision-id: jelmer at samba.org-20081110011000-y0ojz2os3eatv8ri
    parent: jelmer at samba.org-20081110000730-43y0x4za1st25p7n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-11-10 02:10:00 +0100
    message:
      release 0.4.15.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1669.9.19
    revision-id: jelmer at samba.org-20081110000730-43y0x4za1st25p7n
    parent: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-11-10 01:07:30 +0100
    message:
      Add test for #274689 which was apparently already fixed.
    modified:
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
=== modified file 'NEWS'
--- a/NEWS	2008-11-09 21:55:56 +0000
+++ b/NEWS	2008-11-10 02:22:27 +0000
@@ -60,12 +60,12 @@
 
     + Standard commit code provides commit notification. (#79333)
 
-bzr-svn 0.4.15	UNRELEASED
+bzr-svn 0.4.16	UNRELEASED
+
+bzr-svn 0.4.15	2008-11-10
 
   BUG FIXES
 
-   * Fix compatibility with Bazaar 1.10.
-
    * Ignore tags that happen to be files (another instance). (#290664)
 
    * Support copying from files with spaces in their names over http. (#268304)

=== modified file 'subvertpy/setup.py'
--- a/subvertpy/setup.py	2008-11-08 14:31:15 +0000
+++ b/subvertpy/setup.py	2008-11-10 02:22:27 +0000
@@ -321,3 +321,4 @@
           ext_modules=subvertpy_modules("subvertpy"),
           cmdclass = { 'install_lib': install_lib_with_dlls },
           )
+

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-09-09 13:36:52 +0000
+++ b/tests/test_workingtree.py	2008-11-10 02:22:27 +0000
@@ -19,13 +19,16 @@
 
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NoSuchFile, OutOfDateTree
+from bzrlib.errors import NoSuchFile, OutOfDateTree, NotBranchError
 from bzrlib.inventory import Inventory
 from bzrlib.osutils import has_symlinks, supports_executable
-from bzrlib.tests import TestCase
+from bzrlib.repository import Repository
+from bzrlib.tests import KnownFailure, TestCase
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
+from bzrlib.plugins.svn.mapping3 import config_set_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
 from bzrlib.plugins.svn.transport import svn_config
 from bzrlib.plugins.svn.tests import SubversionTestCase
 from bzrlib.plugins.svn.workingtree import generate_ignore_list
@@ -65,6 +68,20 @@
         self.assertIsInstance(inv, Inventory)
         self.assertTrue(inv.has_filename(u"I²C"))
 
+    def test_not_branch_path(self):
+        repos_url = self.make_client('a', 'dc')
+        self.build_tree({"dc/trunk/file": "data"})
+        self.client_add("dc/trunk")
+        self.client_commit("dc", "initial")
+        self.client_update("dc")
+        self.build_tree({"dc/trunk/dir": None})
+        self.client_add("dc/trunk/dir")
+        config_set_scheme(Repository.open(repos_url), TrunkBranchingScheme(0), 
+                          None, True)
+        self.assertRaises(NotBranchError, WorkingTree.open, "dc")
+        self.assertRaises(NotBranchError, WorkingTree.open, "dc/trunk/dir")
+        tree = WorkingTree.open("dc/trunk")
+
     def test_smart_add_file(self):
         self.make_client('a', 'dc')
         self.build_tree({"dc/bl": "data"})