← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
81
81
        self.assertEqual([tip], wt2.get_parent_ids())
82
82
        
83
83
    def test_pending_with_null(self):
84
 
        """When base is forced to revno 0, pending_merges is set"""
 
84
        """When base is forced to revno 0, parent_ids are set"""
85
85
        wt2 = self.test_unrelated()
86
86
        wt1 = WorkingTree.open('.')
87
87
        br1 = wt1.branch
127
127
        transform_tree(tree, tree.branch.basis_tree())
128
128
 
129
129
    def test_ignore_zero_merge_inner(self):
130
 
        # Test that merge_inner's ignore zero paramter is effective
 
130
        # Test that merge_inner's ignore zero parameter is effective
131
131
        tree_a =self.make_branch_and_tree('a')
132
132
        tree_a.commit(message="hello")
133
133
        dir_b = tree_a.bzrdir.sprout('b')
136
136
        log = StringIO()
137
137
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
138
138
                    this_tree=tree_b, ignore_zero=True)
139
 
        log = self._get_log()
 
139
        log = self._get_log(keep_log_file=True)
140
140
        self.failUnless('All changes applied successfully.\n' not in log)
141
141
        tree_b.revert([])
142
142
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
143
143
                    this_tree=tree_b, ignore_zero=False)
144
 
        log = self._get_log()
 
144
        log = self._get_log(keep_log_file=True)
145
145
        self.failUnless('All changes applied successfully.\n' in log)
146
146
 
147
147
    def test_merge_inner_conflicts(self):