← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-10-12 17:03:40 UTC
  • mfrom: (4679.3.94 2.1-simple-set)
  • mto: This revision was merged to the branch mainline in revision 4736.
  • Revision ID: john@arbash-meinel.com-20091012170340-o21aj90jbtswo9m4
Bring in the latest 'simple-set' code.

This is just a prep step for refining and landing the StaticTuple code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
233
233
        tree3.commit('unchanged', rev_id='c3')
234
234
 
235
235
        wt.merge_from_branch(tree2.branch)
236
 
        wt.merge_from_branch(tree3.branch)
 
236
        wt.merge_from_branch(tree3.branch, force=True)
237
237
        wt.commit('merge b3, c3', rev_id='a3')
238
238
 
239
239
        tree2.commit('unchanged', rev_id='b4')
240
240
        tree3.commit('unchanged', rev_id='c4')
241
241
 
242
242
        wt.merge_from_branch(tree3.branch)
243
 
        wt.merge_from_branch(tree2.branch)
 
243
        wt.merge_from_branch(tree2.branch, force=True)
244
244
        wt.commit('merge b4, c4', rev_id='a4')
245
245
 
246
246
        self.assertEqual(['a4'], wt.get_parent_ids())