← 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: 2014-04-03 07:45:32 UTC
  • mfrom: (6591.1.3 lp1030521)
  • Revision ID: pqm@pqm.ubuntu.com-20140403074532-0sdwrky6ie4y20l4
(vila) Use LooseVersion from distutils to check Pyrex/Cython version in
 order to handle non-integers in the version string. (Andrew Starr-Bochicchio)

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 (
 
26
    TestCaseWithTransport,
 
27
    )
 
28
from bzrlib.tests.features import (
23
29
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
26
32
 
27
33
 
28
34
class TestCommitMerge(TestCaseWithTransport):
53
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
60
 
55
61
        self.assertEquals(by.revno(), 3)
56
 
        self.assertEquals(list(by.revision_history()),
57
 
                          [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
            )
58
67
        rev = by.repository.get_revision('y@u-0-2')
59
68
        self.assertEquals(rev.parent_ids,
60
69
                          ['y@u-0-1', 'x@u-0-1'])