Rev 4594: (mbp) fix 2a test failure in merge directive cherrypick test in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4594 [merge]
revision-id: pqm at pqm.ubuntu.com-20090807000320-pq3jv5593sqmoy8x
parent: pqm at pqm.ubuntu.com-20090806022337-7c2oni07fsjq6gun
parent: mbp at sourcefrog.net-20090806065809-g96a4ssolgqmsj4g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-08-07 01:03:20 +0100
message:
  (mbp) fix 2a test failure in merge directive cherrypick test
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
=== modified file 'NEWS'
--- a/NEWS	2009-08-06 02:23:37 +0000
+++ b/NEWS	2009-08-06 06:58:09 +0000
@@ -199,6 +199,9 @@
 Testing
 *******
 
+* Merge directive cherrypick tests must use the same root id.
+  (Martin Pool, #409684)
+
 * Spurious failure in ``check`` tests on rich-root formats fixed.
   (Martin Pool, #408199)
 

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2009-07-19 04:47:49 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2009-08-06 06:58:09 +0000
@@ -374,13 +374,18 @@
 
     def test_directive_cherrypick(self):
         source = self.make_branch_and_tree('source')
+        source.commit("nothing")
+        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
+        # cherrypick from one branch into another unrelated branch with a
+        # different root id will give shape conflicts.  as a workaround we
+        # make sure they share the same root id.
+        target = source.bzrdir.sprout('target').open_workingtree()
         self.build_tree(['source/a'])
         source.add('a')
         source.commit('Added a', rev_id='rev1')
         self.build_tree(['source/b'])
         source.add('b')
         source.commit('Added b', rev_id='rev2')
-        target = self.make_branch_and_tree('target')
         target.commit('empty commit')
         self.write_directive('directive', source.branch, 'target', 'rev2',
                              'rev1')