Rev 426: Add test for pushing to nested branch locations. in file:///home/jelmer/bzr-svn/0.3/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-svn/0.3/

------------------------------------------------------------
revno: 426
revision-id: jelmer at samba.org-20070312234911-720qkouscnlrdzhx
parent: jelmer at samba.org-20070312231130-3q3rr8sgwwf0ikzg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 00:49:11 +0100
message:
  Add test for pushing to nested branch locations.
modified:
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2007-03-12 22:51:22 +0000
+++ b/tests/test_commit.py	2007-03-12 23:49:11 +0000
@@ -256,3 +256,26 @@
         self.assertTrue(wt.branch.last_revision() in 
              repos.get_ancestry(repos.generate_revision_id(3, "")))
 
+class TestPushNested(TestCaseWithSubversionRepository):
+    def setUp(self):
+        super(TestPushNested, self).setUp()
+        self.repos_url = self.make_client('d', 'sc')
+
+        self.build_tree({'sc/foo/trunk/bla': "data"})
+        self.client_add("sc/foo")
+        self.client_commit("sc", "foo")
+
+        self.olddir = BzrDir.open("sc/foo/trunk")
+        os.mkdir("dc")
+        self.newdir = self.olddir.sprout("dc")
+
+    def test_simple(self):
+        self.build_tree({'dc/file': 'data'})
+        wt = self.newdir.open_workingtree()
+        wt.add('file')
+        wt.commit(message="Commit from Bzr")
+        self.olddir.open_branch().pull(self.newdir.open_branch())
+        repos = self.olddir.find_repository()
+        self.client_update("sc")
+        self.assertTrue(os.path.exists("sc/foo/trunk/file"))
+        self.assertFalse(os.path.exists("sc/foo/trunk/filel"))