← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-27 11:48:50 UTC
  • mto: This revision was merged to the branch mainline in revision 6173.
  • Revision ID: v.ladeuil+lp@free.fr-20110927114850-338r2mns0138klv0
https://launchpad.net/bugs/860424
Global options respect their hidden attribute

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import (
21
 
    check,
22
 
    osutils,
23
 
    revision as _mod_revision,
24
 
    )
 
20
from bzrlib import check, osutils
25
21
from bzrlib.errors import PointlessCommit
26
22
from bzrlib.tests import (
27
23
    TestCaseWithTransport,
59
55
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
56
 
61
57
        self.assertEquals(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
63
 
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertEquals(list(
65
 
            graph.iter_lefthand_ancestry(by.last_revision(),
66
 
                [_mod_revision.NULL_REVISION])),
67
 
            ['y@u-0-2', 'y@u-0-1', base_rev])
 
58
        self.assertEquals(list(by.revision_history()),
 
59
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
68
60
        rev = by.repository.get_revision('y@u-0-2')
69
61
        self.assertEquals(rev.parent_ids,
70
62
                          ['y@u-0-1', 'x@u-0-1'])