Rev 3413: (jam) Simple test for bug #83039 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3413
revision-id:pqm at pqm.ubuntu.com-20080507203144-i3ayws9rh7mf97rv
parent: pqm at pqm.ubuntu.com-20080507100452-ya8ofjjd5f5pb9q7
parent: john at arbash-meinel.com-20080418181156-1yrtndjedlfye42r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-05-07 21:31:44 +0100
message:
  (jam) Simple test for bug #83039
modified:
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
    ------------------------------------------------------------
    revno: 3373.4.1
    revision-id:john at arbash-meinel.com-20080418181156-1yrtndjedlfye42r
    parent: pqm at pqm.ubuntu.com-20080417155359-m3nxwwr442bgmsne
    parent: jelmer at samba.org-20070203140036-3ty83ziw5mhx272t
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: test_83039
    timestamp: Fri 2008-04-18 13:11:56 -0500
    message:
      Merge in and clean up the test for bug #83039.
    modified:
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
    ------------------------------------------------------------
    revno: 2258.4.1
    revision-id:jelmer at samba.org-20070203140036-3ty83ziw5mhx272t
    parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Sat 2007-02-03 15:00:36 +0100
    message:
      Add test that demonstrates a corner case bug in commit.
    modified:
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py	2008-03-17 04:38:59 +0000
+++ b/bzrlib/tests/test_commit.py	2008-04-18 18:11:56 +0000
@@ -121,6 +121,26 @@
         tree = b.repository.revision_tree('rev2')
         self.assertFalse(tree.has_id('hello-id'))
 
+    def test_partial_commit_move(self):
+        """Test a partial commit where a file was renamed but not committed.
+
+        https://bugs.launchpad.net/bzr/+bug/83039
+        
+        If not handled properly, commit will try to snapshot
+        dialog.py with olive/ as a parent, while 
+        olive/ has not been snapshotted yet.
+        """
+        wt = self.make_branch_and_tree('.')
+        b = wt.branch
+        self.build_tree(['annotate/', 'annotate/foo.py',
+                         'olive/', 'olive/dialog.py'
+                        ])
+        wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
+        wt.commit(message='add files')
+        wt.rename_one("olive/dialog.py", "aaa")
+        self.build_tree_contents([('annotate/foo.py', 'modified\n')])
+        wt.commit('renamed hello', specific_files=["annotate"])
+
     def test_pointless_commit(self):
         """Commit refuses unless there are changes or it's forced."""
         wt = self.make_branch_and_tree('.')