← 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: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
 
18
18
import os
 
19
import shutil
19
20
 
20
 
from bzrlib import (
21
 
    check,
22
 
    osutils,
23
 
    revision as _mod_revision,
24
 
    )
25
 
from bzrlib.errors import PointlessCommit
 
21
from bzrlib import check, osutils
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError
26
24
from bzrlib.tests import (
 
25
    SymlinkFeature,
27
26
    TestCaseWithTransport,
28
27
    )
29
 
from bzrlib.tests.features import (
30
 
    SymlinkFeature,
31
 
    )
 
28
from bzrlib.tests.test_revision import make_branches
32
29
 
33
30
 
34
31
class TestCommitMerge(TestCaseWithTransport):
59
56
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
57
 
61
58
        self.assertEquals(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
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])
 
59
        self.assertEquals(list(by.revision_history()),
 
60
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
68
61
        rev = by.repository.get_revision('y@u-0-2')
69
62
        self.assertEquals(rev.parent_ids,
70
63
                          ['y@u-0-1', 'x@u-0-1'])
99
92
 
100
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
101
94
        tree = by.repository.revision_tree('y@u-0-2')
102
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
103
 
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
95
        inv = tree.inventory
 
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
104
98
 
105
99
        check.check_dwim(bx.base, False, True, True)
106
100
        check.check_dwim(by.base, False, True, True)