← 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: Canonical.com Patch Queue Manager
  • Date: 2009-10-06 20:45:48 UTC
  • mfrom: (4728.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091006204548-bjnc3z4k256ppimz
MutableTree.has_changes() does not require a tree parameter anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
103
103
        uncommit.uncommit(b)
104
104
        self.assertEqual(len(b.revision_history()), 2)
105
105
        self.assertEqual(len(t_a.branch.revision_history()), 2)
106
 
        # update A's tree to not have the uncomitted revision referenced.
 
106
        # update A's tree to not have the uncommitted revision referenced.
107
107
        t_a.update()
108
108
        t_a.commit('commit 3b')
109
109
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
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())