Rev 2864: test for bug #140419 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2864
revision-id: pqm at pqm.ubuntu.com-20070925201921-vjahqpm8bfx6bbvn
parent: pqm at pqm.ubuntu.com-20070925194602-h8z36snrc8eqjj4j
parent: bialix at ukr.net-20070925192314-emlzeasnptqpvd1b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-25 21:19:21 +0100
message:
  test for bug #140419 
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
    ------------------------------------------------------------
    revno: 2833.2.4
    merged: bialix at ukr.net-20070925192314-emlzeasnptqpvd1b
    parent: bialix at ukr.net-20070925191741-u1ak81l763dsym0w
    parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bugtest.140419
    timestamp: Tue 2007-09-25 22:23:14 +0300
    message:
      merge bzr.dev
    ------------------------------------------------------------
    revno: 2833.2.3
    merged: bialix at ukr.net-20070925191741-u1ak81l763dsym0w
    parent: bialix at ukr.net-20070922172916-yzl05wpf8ye852gw
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bugtest.140419
    timestamp: Tue 2007-09-25 22:17:41 +0300
    message:
      typo
    ------------------------------------------------------------
    revno: 2833.2.2
    merged: bialix at ukr.net-20070922172916-yzl05wpf8ye852gw
    parent: bialix at ukr.net-20070920093025-cy85a36ry1xad131
    parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bugtest.140419
    timestamp: Sat 2007-09-22 20:29:16 +0300
    message:
      Bug #140419 fixed by Robert Collins
    ------------------------------------------------------------
    revno: 2833.2.1
    merged: bialix at ukr.net-20070920093025-cy85a36ry1xad131
    parent: pqm at pqm.ubuntu.com-20070919101753-4e8wasie12tewyjv
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bugtest.140419
    timestamp: Thu 2007-09-20 12:30:25 +0300
    message:
      XFAIL test for bug #140419
=== modified file 'NEWS'
--- a/NEWS	2007-09-25 19:04:31 +0000
+++ b/NEWS	2007-09-25 20:19:21 +0000
@@ -76,7 +76,10 @@
      paramiko.
      (Vincent Ladeuil, #59150)
 
-   * Fix commit ordering in corner case (Aaron Bentley, #94975)
+   * Fix commit ordering in corner case. (Aaron Bentley, #94975)
+
+   * Fix long standing bug in partial commit when there are renames 
+     left in tree. (Robert Collins, #140419)
 
    * Fix selftest semi-random noise during http related tests.
      (Vincent Ladeuil, #140614)

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2007-09-22 16:20:37 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2007-09-25 19:23:14 +0000
@@ -521,3 +521,20 @@
         last_rev = tree.branch.repository.get_revision(tree.last_revision())
         properties = last_rev.properties
         self.assertEqual('John Doe', properties['author'])
+
+    def test_partial_commit_with_renames_in_tree(self):
+        # this test illustrates bug #140419
+        t = self.make_branch_and_tree('.')
+        self.build_tree(['dir/', 'dir/a', 'test'])
+        t.add(['dir/', 'dir/a', 'test'])
+        t.commit('initial commit')
+        # important part: file dir/a should change parent
+        # and should appear before old parent
+        # then during partial commit we have error
+        # parent_id {dir-XXX} not in inventory
+        t.rename_one('dir/a', 'a')
+        self.build_tree_contents([('test', 'changes in test')])
+        # partial commit
+        out, err = self.run_bzr('commit test -m "partial commit"')
+        self.assertEquals('', out)
+        self.assertContainsRe(err, r'modified test\nCommitted revision 2.')