← 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

(jelmer) Support upgrading between the 2a and development-colo formats.
 (Jelmer Vernooij)

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
 
 
20
from bzrlib import check, osutils
 
21
from bzrlib.errors import PointlessCommit
21
22
from bzrlib.tests import (
 
23
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
22
26
    SymlinkFeature,
23
 
    TestCaseWithTransport,
24
27
    )
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
27
 
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
28
 
30
29
 
31
30
class TestCommitMerge(TestCaseWithTransport):
42
41
        bx = wtx.branch
43
42
        wty = wtx.bzrdir.sprout('y').open_workingtree()
44
43
        by = wty.branch
45
 
        
 
44
 
46
45
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
46
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
47
 
49
 
        self.assertEqual((1, []), by.fetch(bx))
 
48
        by.fetch(bx)
50
49
        # just having the history there does nothing
51
50
        self.assertRaises(PointlessCommit,
52
51
                          wty.commit,
89
88
                          wty.commit,
90
89
                          'partial commit', allow_pointless=False,
91
90
                          specific_files=['ecks'])
92
 
        
 
91
 
93
92
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
93
        tree = by.repository.revision_tree('y@u-0-2')
95
 
        inv = tree.inventory
96
 
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
 
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
94
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
95
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
98
96
 
99
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
 
97
        check.check_dwim(bx.base, False, True, True)
 
98
        check.check_dwim(by.base, False, True, True)
103
99
 
104
100
    def test_merge_with_symlink(self):
105
101
        self.requireFeature(SymlinkFeature)