← 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: 2008-03-16 14:01:20 UTC
  • mfrom: (3280.2.5 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080316140120-i3yq8yr1l66m11h7
Start 1.4 development

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