← 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: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
20
20
from bzrlib import (
21
21
    check,
22
22
    osutils,
23
 
    revision as _mod_revision,
24
23
    )
25
24
from bzrlib.errors import PointlessCommit
26
25
from bzrlib.tests import (
29
28
from bzrlib.tests.features import (
30
29
    SymlinkFeature,
31
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
32
32
 
33
33
 
34
34
class TestCommitMerge(TestCaseWithTransport):
61
61
        self.assertEquals(by.revno(), 3)
62
62
        graph = wty.branch.repository.get_graph()
63
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])
 
64
        self.assertThat(by,
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
68
67
        rev = by.repository.get_revision('y@u-0-2')
69
68
        self.assertEquals(rev.parent_ids,
70
69
                          ['y@u-0-1', 'x@u-0-1'])