← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-27 15:38:14 UTC
  • mfrom: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111027153814-0r4nd2io1jv6t47f
Merge 2.4 into trunk including fix for bug #880701

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
420
420
        self.addCleanup(tree.unlock)
421
421
        self.build_tree(['a'])
422
422
        tree.add('a')
423
 
        tree.commit("added a")
424
 
        first_rev = tree.branch.revision_history()[0]
 
423
        first_rev = tree.commit("added a")
425
424
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
426
425
                                          _mod_revision.NULL_REVISION,
427
426
                                          first_rev)
509
508
        self.addCleanup(tree.unlock)
510
509
        self.build_tree(['a'])
511
510
        tree.add('a')
512
 
        tree.commit("added a")
 
511
        first_rev = tree.commit("added a")
513
512
        old_root_id = tree.get_root_id()
514
 
        first_rev = tree.branch.revision_history()[0]
515
513
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
516
514
                                          _mod_revision.NULL_REVISION,
517
515
                                          first_rev)