← 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-02-26 15:39:49 UTC
  • mto: (5691.1.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 5692.
  • Revision ID: jelmer@samba.org-20110226153949-o0fk909b30g7z570
https://launchpad.net/bugs/397556
Fix the use of "bzr tags" in branches with ghosts in their mainline /and/ tags on revisions not in the branch ancestry.

Show diffs side-by-side

added added

removed removed

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