← 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: 2011-05-04 12:10:51 UTC
  • mfrom: (5819.1.4 777007-developer-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20110504121051-aovlsmqiivjmc4fc
(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

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, 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,
85
86
                          wty.commit,
86
87
                          'partial commit', allow_pointless=False,
87
88
                          specific_files=['ecks'])
88
 
        
 
89
 
89
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
90
91
        tree = by.repository.revision_tree('y@u-0-2')
91
 
        inv = tree.inventory
92
 
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
93
 
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
94
 
 
95
 
        bx.check()
96
 
        by.check()
97
 
        bx.repository.check([bx.last_revision()])
98
 
        by.repository.check([by.last_revision()])
 
92
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
93
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
94
 
 
95
        check.check_dwim(bx.base, False, True, True)
 
96
        check.check_dwim(by.base, False, True, True)
 
97
 
 
98
    def test_merge_with_symlink(self):
 
99
        self.requireFeature(SymlinkFeature)
 
100
        tree_a = self.make_branch_and_tree('tree_a')
 
101
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
102
        tree_a.add('link')
 
103
        tree_a.commit('added link')
 
104
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
105
        self.build_tree(['tree_a/file'])
 
106
        tree_a.add('file')
 
107
        tree_a.commit('added file')
 
108
        self.build_tree(['tree_b/another_file'])
 
109
        tree_b.add('another_file')
 
110
        tree_b.commit('add another file')
 
111
        tree_b.merge_from_branch(tree_a.branch)
 
112
        tree_b.commit('merge')