← 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: Zearin
  • Date: 2010-11-12 22:43:38 UTC
  • mto: (5570.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5572.
  • Revision ID: zearin@users.sourceforge.net-20101112224338-x4dzw5gafju8txn5
Continued capitalization fixes.  (URL, URLs)

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 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
19
import shutil
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib import check, osutils
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
    )
24
28
from bzrlib.tests.test_revision import make_branches
25
29
 
26
30
 
38
42
        bx = wtx.branch
39
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)
43
47
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
44
48
 
45
 
        self.assertEqual((1, []), by.fetch(bx))
 
49
        by.fetch(bx)
46
50
        # just having the history there does nothing
47
51
        self.assertRaises(PointlessCommit,
48
52
                          wty.commit,
63
67
        wtx = self.make_branch_and_tree('x')
64
68
        base_rev = wtx.commit('common parent')
65
69
        bx = wtx.branch
 
70
        wtx.commit('establish root id')
66
71
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
72
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
67
73
        by = wty.branch
68
74
 
69
75
        self.build_tree(['x/ecks', 'y/why'])
83
89
                          wty.commit,
84
90
                          'partial commit', allow_pointless=False,
85
91
                          specific_files=['ecks'])
86
 
        
 
92
 
87
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
88
94
        tree = by.repository.revision_tree('y@u-0-2')
89
95
        inv = tree.inventory
90
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
91
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
92
98
 
93
 
        bx.check()
94
 
        by.check()
95
 
        bx.repository.check([bx.last_revision()])
96
 
        by.repository.check([by.last_revision()])
 
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')