/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

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())