← 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: 2006-08-17 07:52:09 UTC
  • mfrom: (1910.3.4 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
(andrew) Trivial fixes to NotImplemented errors.

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 by 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
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import (
22
 
    TestCaseWithTransport,
23
 
    TestSkipped,
24
 
    )
 
21
from bzrlib.tests import TestCaseWithTransport
25
22
from bzrlib.branch import Branch
26
23
from bzrlib.errors import PointlessCommit, BzrError
27
24
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
29
25
 
30
26
 
31
27
class TestCommitMerge(TestCaseWithTransport):
38
34
    def test_merge_commit_empty(self):
39
35
        """Simple commit of two-way merge of empty trees."""
40
36
        wtx = self.make_branch_and_tree('x')
41
 
        base_rev = wtx.commit('common parent')
42
37
        bx = wtx.branch
43
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
38
        wty = self.make_branch_and_tree('y')
44
39
        by = wty.branch
45
 
        
 
40
 
46
41
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
42
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
43
 
52
47
                          wty.commit,
53
48
                          'no changes yet', rev_id='y@u-0-2',
54
49
                          allow_pointless=False)
55
 
        wty.merge_from_branch(bx)
 
50
        wty.add_pending_merge('x@u-0-1')
56
51
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
52
 
58
 
        self.assertEquals(by.revno(), 3)
 
53
        self.assertEquals(by.revno(), 2)
59
54
        self.assertEquals(list(by.revision_history()),
60
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
55
                          ['y@u-0-1', 'y@u-0-2'])
61
56
        rev = by.repository.get_revision('y@u-0-2')
62
57
        self.assertEquals(rev.parent_ids,
63
58
                          ['y@u-0-1', 'x@u-0-1'])
65
60
    def test_merge_new_file(self):
66
61
        """Commit merge of two trees with no overlapping files."""
67
62
        wtx = self.make_branch_and_tree('x')
68
 
        base_rev = wtx.commit('common parent')
69
63
        bx = wtx.branch
70
 
        wtx.commit('establish root id')
71
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
72
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
 
64
        wty = self.make_branch_and_tree('y')
73
65
        by = wty.branch
74
66
 
75
67
        self.build_tree(['x/ecks', 'y/why'])
80
72
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
73
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
82
74
 
83
 
        wty.merge_from_branch(bx)
 
75
        by.fetch(bx)
 
76
        # we haven't merged the texts, but let's fake it
 
77
        shutil.copyfile('x/ecks', 'y/ecks')
 
78
        wty.add(['ecks'], ['ecks-id'])
 
79
        wty.add_pending_merge('x@u-0-1')
84
80
 
85
81
        # partial commit of merges is currently not allowed, because
86
82
        # it would give different merge graphs for each file which
100
96
        by.check()
101
97
        bx.repository.check([bx.last_revision()])
102
98
        by.repository.check([by.last_revision()])
103
 
 
104
 
    def test_merge_with_symlink(self):
105
 
        if not osutils.has_symlinks():
106
 
            raise TestSkipped('Symlinks are not supported on this platform')
107
 
        tree_a = self.make_branch_and_tree('tree_a')
108
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
109
 
        tree_a.add('link')
110
 
        tree_a.commit('added link')
111
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
112
 
        self.build_tree(['tree_a/file'])
113
 
        tree_a.add('file')
114
 
        tree_a.commit('added file')
115
 
        self.build_tree(['tree_b/another_file'])
116
 
        tree_b.add('another_file')
117
 
        tree_b.commit('add another file')
118
 
        tree_b.merge_from_branch(tree_a.branch)
119
 
        tree_b.commit('merge')