← 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: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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
20
19
 
 
20
from bzrlib import (
 
21
    check,
 
22
    osutils,
 
23
    revision as _mod_revision,
 
24
    )
 
25
from bzrlib.errors import PointlessCommit
21
26
from bzrlib.tests import (
 
27
    TestCaseWithTransport,
 
28
    )
 
29
from bzrlib.tests.features import (
22
30
    SymlinkFeature,
23
 
    TestCaseWithTransport,
24
31
    )
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
27
 
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
32
 
30
33
 
31
34
class TestCommitMerge(TestCaseWithTransport):
56
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
60
 
58
61
        self.assertEquals(by.revno(), 3)
59
 
        self.assertEquals(list(by.revision_history()),
60
 
                          [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.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])
61
68
        rev = by.repository.get_revision('y@u-0-2')
62
69
        self.assertEquals(rev.parent_ids,
63
70
                          ['y@u-0-1', 'x@u-0-1'])
92
99
 
93
100
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
101
        tree = by.repository.revision_tree('y@u-0-2')
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')
 
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')
98
104
 
99
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
 
105
        check.check_dwim(bx.base, False, True, True)
 
106
        check.check_dwim(by.base, False, True, True)
103
107
 
104
108
    def test_merge_with_symlink(self):
105
109
        self.requireFeature(SymlinkFeature)