/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Robert Collins
  • Date: 2006-04-28 11:01:38 UTC
  • mfrom: (1687 +trunk)
  • mto: (1704.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1706.
  • Revision ID: robertc@robertcollins.net-20060428110138-0e69ecb765434f9d
Merge from mainline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
1
import os
 
2
from StringIO import StringIO
2
3
 
3
4
from bzrlib.branch import Branch
4
5
from bzrlib.builtins import merge
5
6
from bzrlib.commit import commit
6
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
7
 
from bzrlib.fetch import fetch
8
 
from bzrlib.merge import transform_tree
 
8
from bzrlib.merge import transform_tree, merge_inner
9
9
from bzrlib.osutils import pathjoin
10
10
from bzrlib.revision import common_ancestor
11
11
from bzrlib.tests import TestCaseWithTransport
 
12
from bzrlib.trace import (enable_test_log, disable_test_log)
12
13
from bzrlib.workingtree import WorkingTree
13
14
 
14
15
 
22
23
        merge([u'.', -1], [None, None])
23
24
        self.assertEquals(len(wt.pending_merges()), 0)
24
25
 
 
26
    def test_undo(self):
 
27
        wt = self.make_branch_and_tree('.')
 
28
        wt.commit("lala!")
 
29
        wt.commit("haha!")
 
30
        wt.commit("blabla!")
 
31
        merge([u'.', 2], [u'.', 1])
 
32
 
25
33
    def test_nocommits(self):
26
34
        self.test_pending()
27
35
        wt2 = self.make_branch_and_tree('branch2')
36
44
                          [None, None])
37
45
        return wt2
38
46
 
 
47
    def test_merge_one(self):
 
48
        wt1 = self.make_branch_and_tree('branch1')
 
49
        wt1.commit('empty commit')
 
50
        wt2 = self.make_branch_and_tree('branch2')
 
51
        wt2.pull(wt1.branch)
 
52
        file('branch1/foo', 'wb').write('foo')
 
53
        file('branch1/bar', 'wb').write('bar')
 
54
        wt1.add('foo')
 
55
        wt1.add('bar')
 
56
        wt1.commit('add foobar')
 
57
        os.chdir('branch2')
 
58
        self.run_bzr('merge', '../branch1/baz', retcode=3)
 
59
        self.run_bzr('merge', '../branch1/foo')
 
60
        self.failUnlessExists('foo')
 
61
        self.failIfExists('bar')
 
62
        wt2 = WorkingTree.open_containing('branch2')[0]
 
63
        self.assertEqual(wt2.pending_merges(), [])
 
64
 
39
65
    def test_pending_with_null(self):
40
66
        """When base is forced to revno 0, pending_merges is set"""
41
67
        wt2 = self.test_unrelated()
42
68
        wt1 = WorkingTree.open('.')
43
69
        br1 = wt1.branch
44
 
        fetch(from_branch=wt2.branch, to_branch=br1)
 
70
        br1.fetch(wt2.branch)
45
71
        # merge all of branch 2 into branch 1 even though they 
46
72
        # are not related.
47
73
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
80
106
        tree.rename_one(filename, filename2)
81
107
        tree.rename_one('dirname1', 'dirname2')
82
108
        transform_tree(tree, tree.branch.basis_tree())
 
109
 
 
110
    def test_ignore_zero_merge_inner(self):
 
111
        # Test that merge_inner's ignore zero paramter is effective
 
112
        tree_a =self.make_branch_and_tree('a')
 
113
        tree_a.commit(message="hello")
 
114
        dir_b = tree_a.bzrdir.sprout('b')
 
115
        tree_b = dir_b.open_workingtree()
 
116
        tree_a.commit(message="hello again")
 
117
        log = StringIO()
 
118
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
 
119
                    this_tree=tree_b, ignore_zero=True)
 
120
        log = self._get_log()
 
121
        self.failUnless('All changes applied successfully.\n' not in log)
 
122
        tree_b.revert([])
 
123
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
 
124
                    this_tree=tree_b, ignore_zero=False)
 
125
        log = self._get_log()
 
126
        self.failUnless('All changes applied successfully.\n' in log)