← 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: Aaron Bentley
  • Date: 2009-03-24 12:15:01 UTC
  • mfrom: (4195 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4196.
  • Revision ID: aaron@aaronbentley.com-20090324121501-rd8zjsdk9fok8mvk
Merge and resolve NEWS conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests import (
 
22
    SymlinkFeature,
 
23
    TestCaseWithTransport,
 
24
    )
22
25
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
 
26
from bzrlib.errors import PointlessCommit, BzrError
24
27
from bzrlib.tests.test_revision import make_branches
25
 
from bzrlib.check import check
 
28
from bzrlib import osutils
26
29
 
27
30
 
28
31
class TestCommitMerge(TestCaseWithTransport):
35
38
    def test_merge_commit_empty(self):
36
39
        """Simple commit of two-way merge of empty trees."""
37
40
        wtx = self.make_branch_and_tree('x')
 
41
        base_rev = wtx.commit('common parent')
38
42
        bx = wtx.branch
39
 
        wty = self.make_branch_and_tree('y')
 
43
        wty = wtx.bzrdir.sprout('y').open_workingtree()
40
44
        by = wty.branch
41
45
 
42
46
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
48
52
                          wty.commit,
49
53
                          'no changes yet', rev_id='y@u-0-2',
50
54
                          allow_pointless=False)
51
 
        wty.add_pending_merge('x@u-0-1')
 
55
        wty.merge_from_branch(bx)
52
56
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
57
 
54
 
        self.assertEquals(by.revno(), 2)
 
58
        self.assertEquals(by.revno(), 3)
55
59
        self.assertEquals(list(by.revision_history()),
56
 
                          ['y@u-0-1', 'y@u-0-2'])
 
60
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
57
61
        rev = by.repository.get_revision('y@u-0-2')
58
62
        self.assertEquals(rev.parent_ids,
59
63
                          ['y@u-0-1', 'x@u-0-1'])
61
65
    def test_merge_new_file(self):
62
66
        """Commit merge of two trees with no overlapping files."""
63
67
        wtx = self.make_branch_and_tree('x')
 
68
        base_rev = wtx.commit('common parent')
64
69
        bx = wtx.branch
65
 
        wty = self.make_branch_and_tree('y')
 
70
        wtx.commit('establish root id')
 
71
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
72
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
66
73
        by = wty.branch
67
74
 
68
75
        self.build_tree(['x/ecks', 'y/why'])
73
80
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
74
81
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
75
82
 
76
 
        by.fetch(bx)
77
 
        # we haven't merged the texts, but let's fake it
78
 
        shutil.copyfile('x/ecks', 'y/ecks')
79
 
        wty.add(['ecks'], ['ecks-id'])
80
 
        wty.add_pending_merge('x@u-0-1')
 
83
        wty.merge_from_branch(bx)
81
84
 
82
85
        # partial commit of merges is currently not allowed, because
83
86
        # it would give different merge graphs for each file which
86
89
                          wty.commit,
87
90
                          'partial commit', allow_pointless=False,
88
91
                          specific_files=['ecks'])
89
 
        
 
92
 
90
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
94
        tree = by.repository.revision_tree('y@u-0-2')
92
95
        inv = tree.inventory
93
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
94
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
98
 
96
 
        check(bx, False)
97
 
        check(by, False)
 
99
        bx.check()
 
100
        by.check()
 
101
        bx.repository.check([bx.last_revision()])
 
102
        by.repository.check([by.last_revision()])
 
103
 
 
104
    def test_merge_with_symlink(self):
 
105
        self.requireFeature(SymlinkFeature)
 
106
        tree_a = self.make_branch_and_tree('tree_a')
 
107
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
108
        tree_a.add('link')
 
109
        tree_a.commit('added link')
 
110
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
111
        self.build_tree(['tree_a/file'])
 
112
        tree_a.add('file')
 
113
        tree_a.commit('added file')
 
114
        self.build_tree(['tree_b/another_file'])
 
115
        tree_b.add('another_file')
 
116
        tree_b.commit('add another file')
 
117
        tree_b.merge_from_branch(tree_a.branch)
 
118
        tree_b.commit('merge')