← 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: Alexander Belchenko
  • Date: 2012-03-29 08:34:13 UTC
  • mto: (6015.44.14 2.4)
  • mto: This revision was merged to the branch mainline in revision 6513.
  • Revision ID: bialix@ukr.net-20120329083413-d4bqqdtfn2yrxp4f
change st_dev, st_ino, st_uid, st_gid from int members to properties.

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