← 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: Martin Packman
  • Date: 2011-12-08 19:00:14 UTC
  • mto: This revision was merged to the branch mainline in revision 6359.
  • Revision ID: martin.packman@canonical.com-20111208190014-mi8jm6v7jygmhb0r
Use --include-duplicates for make update-pot which already combines multiple msgid strings prettily

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,
23
24
    )
24
25
from bzrlib.errors import PointlessCommit
25
26
from bzrlib.tests import (
28
29
from bzrlib.tests.features import (
29
30
    SymlinkFeature,
30
31
    )
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.assertThat(by,
65
 
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
66
 
            )
 
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])
67
68
        rev = by.repository.get_revision('y@u-0-2')
68
69
        self.assertEquals(rev.parent_ids,
69
70
                          ['y@u-0-1', 'x@u-0-1'])