← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Martin Pool
  • Date: 2009-08-06 06:58:09 UTC
  • mto: This revision was merged to the branch mainline in revision 4594.
  • Revision ID: mbp@sourcefrog.net-20090806065809-g96a4ssolgqmsj4g
https://launchpad.net/bugs/409684
Merge directive tests must use trees with the same root id.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
374
374
 
375
375
    def test_directive_cherrypick(self):
376
376
        source = self.make_branch_and_tree('source')
 
377
        source.commit("nothing")
 
378
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
 
379
        # cherrypick from one branch into another unrelated branch with a
 
380
        # different root id will give shape conflicts.  as a workaround we
 
381
        # make sure they share the same root id.
 
382
        target = source.bzrdir.sprout('target').open_workingtree()
377
383
        self.build_tree(['source/a'])
378
384
        source.add('a')
379
385
        source.commit('Added a', rev_id='rev1')
380
386
        self.build_tree(['source/b'])
381
387
        source.add('b')
382
388
        source.commit('Added b', rev_id='rev2')
383
 
        target = self.make_branch_and_tree('target')
384
389
        target.commit('empty commit')
385
390
        self.write_directive('directive', source.branch, 'target', 'rev2',
386
391
                             'rev1')