← 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: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
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 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
20
 
21
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
 
23
from bzrlib.errors import PointlessCommit, BzrError
24
24
from bzrlib.tests.test_revision import make_branches
25
 
from bzrlib.check import check
26
25
 
27
26
 
28
27
class TestCommitMerge(TestCaseWithTransport):
35
34
    def test_merge_commit_empty(self):
36
35
        """Simple commit of two-way merge of empty trees."""
37
36
        wtx = self.make_branch_and_tree('x')
 
37
        base_rev = wtx.commit('common parent')
38
38
        bx = wtx.branch
39
 
        wty = self.make_branch_and_tree('y')
 
39
        wty = wtx.bzrdir.sprout('y').open_workingtree()
40
40
        by = wty.branch
41
 
 
 
41
        
42
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
44
44
 
48
48
                          wty.commit,
49
49
                          'no changes yet', rev_id='y@u-0-2',
50
50
                          allow_pointless=False)
51
 
        wty.add_pending_merge('x@u-0-1')
 
51
        wty.merge_from_branch(bx)
52
52
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
53
 
54
 
        self.assertEquals(by.revno(), 2)
 
54
        self.assertEquals(by.revno(), 3)
55
55
        self.assertEquals(list(by.revision_history()),
56
 
                          ['y@u-0-1', 'y@u-0-2'])
 
56
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
57
57
        rev = by.repository.get_revision('y@u-0-2')
58
58
        self.assertEquals(rev.parent_ids,
59
59
                          ['y@u-0-1', 'x@u-0-1'])
61
61
    def test_merge_new_file(self):
62
62
        """Commit merge of two trees with no overlapping files."""
63
63
        wtx = self.make_branch_and_tree('x')
 
64
        base_rev = wtx.commit('common parent')
64
65
        bx = wtx.branch
65
 
        wty = self.make_branch_and_tree('y')
 
66
        wtx.commit('establish root id')
 
67
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
68
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
66
69
        by = wty.branch
67
70
 
68
71
        self.build_tree(['x/ecks', 'y/why'])
73
76
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
74
77
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
75
78
 
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')
 
79
        wty.merge_from_branch(bx)
81
80
 
82
81
        # partial commit of merges is currently not allowed, because
83
82
        # it would give different merge graphs for each file which
93
92
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
94
93
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
94
 
96
 
        check(bx, False)
97
 
        check(by, False)
 
95
        bx.check()
 
96
        by.check()
 
97
        bx.repository.check([bx.last_revision()])
 
98
        by.repository.check([by.last_revision()])