← 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: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

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 check, osutils
 
20
from bzrlib import (
 
21
    check,
 
22
    osutils,
 
23
    )
21
24
from bzrlib.errors import PointlessCommit
22
25
from bzrlib.tests import (
23
26
    TestCaseWithTransport,
25
28
from bzrlib.tests.features import (
26
29
    SymlinkFeature,
27
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
28
32
 
29
33
 
30
34
class TestCommitMerge(TestCaseWithTransport):
55
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
56
60
 
57
61
        self.assertEquals(by.revno(), 3)
58
 
        self.assertEquals(list(by.revision_history()),
59
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
62
        graph = wty.branch.repository.get_graph()
 
63
        self.addCleanup(wty.lock_read().unlock)
 
64
        self.assertThat(by,
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
60
67
        rev = by.repository.get_revision('y@u-0-2')
61
68
        self.assertEquals(rev.parent_ids,
62
69
                          ['y@u-0-1', 'x@u-0-1'])