Rev 446: Reproduce mwh bug with a simpler test function. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

------------------------------------------------------------
revno: 446
revision-id: jelmer at samba.org-20070502115715-4o1dliyaye1a6a3n
parent: jelmer at samba.org-20070502005238-juqk20xhks8t6501
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-05-02 13:57:15 +0200
message:
  Reproduce mwh bug with a simpler test function.
modified:
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2007-05-02 00:52:38 +0000
+++ b/tests/test_repos.py	2007-05-02 11:57:15 +0000
@@ -2031,7 +2031,7 @@
         self.assertEquals(repos.generate_revision_id(1, "trunk"), \
                 repos._mainline_revision_parent("trunk", 2))
 
-    def test_mainline_revision_parent_moved(self):
+    def test_mainline_revision_parent_copied(self):
         repos_url = self.make_client('d', 'dc')
         self.build_tree({'dc/py/trunk/adir/afile': "data", 
                          'dc/py/trunk/adir/stationary': None})
@@ -2044,6 +2044,21 @@
         self.assertEquals(repos.generate_revision_id(1, "py/trunk"), \
                 repos._mainline_revision_parent("de/trunk", 2))
 
+    def test_mainline_revision_nested_deleted(self):
+        repos_url = self.make_client('d', 'dc')
+        self.build_tree({'dc/py/trunk/adir/afile': "data", 
+                         'dc/py/trunk/adir/stationary': None})
+        self.client_add("dc/py")
+        self.client_commit("dc", "Initial commit")
+        self.client_copy("dc/py", "dc/de")
+        self.client_commit("dc", "Incremental commit")
+        self.client_delete("dc/de/trunk/adir")
+        self.client_commit("dc", "Another incremental commit")
+        repos = Repository.open(repos_url)
+        repos.set_branching_scheme(TrunkBranchingScheme(1))
+        self.assertEquals(repos.generate_revision_id(2, "de/trunk"), \
+                repos._mainline_revision_parent("de/trunk", 3))
+
     def test_fetch_crosscopy(self):
         repos_url = self.make_client('d', 'dc')
         self.build_tree({'dc/trunk/adir/afile': "data",