← 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: Canonical.com Patch Queue Manager
  • Date: 2006-08-31 06:06:38 UTC
  • mfrom: (1966.1.2 build-resolver)
  • Revision ID: pqm@pqm.ubuntu.com-20060831060638-bfc0303de36a40a8
Behave reasonably when creating a checkout in a directory with files

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 by 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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib import check, osutils
 
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
23
from bzrlib.errors import PointlessCommit, BzrError
24
 
from bzrlib.tests import (
25
 
    SymlinkFeature,
26
 
    TestCaseWithTransport,
27
 
    )
28
24
from bzrlib.tests.test_revision import make_branches
29
25
 
30
26
 
42
38
        bx = wtx.branch
43
39
        wty = wtx.bzrdir.sprout('y').open_workingtree()
44
40
        by = wty.branch
45
 
 
 
41
        
46
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
44
 
49
 
        by.fetch(bx)
 
45
        self.assertEqual((1, []), by.fetch(bx))
50
46
        # just having the history there does nothing
51
47
        self.assertRaises(PointlessCommit,
52
48
                          wty.commit,
53
49
                          'no changes yet', rev_id='y@u-0-2',
54
50
                          allow_pointless=False)
55
 
        wty.merge_from_branch(bx)
 
51
        self.merge(bx, wty)
56
52
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
53
 
58
54
        self.assertEquals(by.revno(), 3)
67
63
        wtx = self.make_branch_and_tree('x')
68
64
        base_rev = wtx.commit('common parent')
69
65
        bx = wtx.branch
70
 
        wtx.commit('establish root id')
71
66
        wty = wtx.bzrdir.sprout('y').open_workingtree()
72
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
73
67
        by = wty.branch
74
68
 
75
69
        self.build_tree(['x/ecks', 'y/why'])
80
74
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
75
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
82
76
 
83
 
        wty.merge_from_branch(bx)
 
77
        self.merge(bx, wty)
84
78
 
85
79
        # partial commit of merges is currently not allowed, because
86
80
        # it would give different merge graphs for each file which
89
83
                          wty.commit,
90
84
                          'partial commit', allow_pointless=False,
91
85
                          specific_files=['ecks'])
92
 
 
 
86
        
93
87
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
88
        tree = by.repository.revision_tree('y@u-0-2')
95
89
        inv = tree.inventory
96
90
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
91
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
92
 
99
 
        check.check_dwim(bx.base, False, True, True)
100
 
        check.check_dwim(by.base, False, True, True)
101
 
 
102
 
    def test_merge_with_symlink(self):
103
 
        self.requireFeature(SymlinkFeature)
104
 
        tree_a = self.make_branch_and_tree('tree_a')
105
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
106
 
        tree_a.add('link')
107
 
        tree_a.commit('added link')
108
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
109
 
        self.build_tree(['tree_a/file'])
110
 
        tree_a.add('file')
111
 
        tree_a.commit('added file')
112
 
        self.build_tree(['tree_b/another_file'])
113
 
        tree_b.add('another_file')
114
 
        tree_b.commit('add another file')
115
 
        tree_b.merge_from_branch(tree_a.branch)
116
 
        tree_b.commit('merge')
 
93
        bx.check()
 
94
        by.check()
 
95
        bx.repository.check([bx.last_revision()])
 
96
        by.repository.check([by.last_revision()])