← 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: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

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
 
        first_rev = tree.commit("added a")
 
423
        tree.commit("added a")
 
424
        first_rev = tree.branch.revision_history()[0]
424
425
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
425
426
                                          _mod_revision.NULL_REVISION,
426
427
                                          first_rev)
508
509
        self.addCleanup(tree.unlock)
509
510
        self.build_tree(['a'])
510
511
        tree.add('a')
511
 
        first_rev = tree.commit("added a")
 
512
        tree.commit("added a")
512
513
        old_root_id = tree.get_root_id()
 
514
        first_rev = tree.branch.revision_history()[0]
513
515
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
514
516
                                          _mod_revision.NULL_REVISION,
515
517
                                          first_rev)