← 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

Various hopefully improvements, but wsgi is broken, handing over to spiv :).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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., 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
import shutil
19
20
 
20
 
from bzrlib import check, osutils
21
 
from bzrlib.errors import PointlessCommit
22
 
from bzrlib.tests import (
23
 
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
 
    )
 
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
26
25
 
27
26
 
28
27
class TestCommitMerge(TestCaseWithTransport):
39
38
        bx = wtx.branch
40
39
        wty = wtx.bzrdir.sprout('y').open_workingtree()
41
40
        by = wty.branch
42
 
 
 
41
        
43
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
44
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
44
 
46
 
        by.fetch(bx)
 
45
        self.assertEqual((1, []), by.fetch(bx))
47
46
        # just having the history there does nothing
48
47
        self.assertRaises(PointlessCommit,
49
48
                          wty.commit,
86
85
                          wty.commit,
87
86
                          'partial commit', allow_pointless=False,
88
87
                          specific_files=['ecks'])
89
 
 
 
88
        
90
89
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
90
        tree = by.repository.revision_tree('y@u-0-2')
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')
 
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()])