← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-03 13:48:52 UTC
  • mfrom: (1835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1836.
  • Revision ID: john@arbash-meinel.com-20060703134852-295eeb195b8e2811
[merge] bzr.dev 1835

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
19
19
 
20
20
from bzrlib.branch import Branch
21
21
from bzrlib.builtins import merge
 
22
from bzrlib.conflicts import ConflictList, TextConflict
22
23
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
23
24
from bzrlib.merge import transform_tree, merge_inner
24
25
from bzrlib.osutils import pathjoin
139
140
                    this_tree=tree_b, ignore_zero=False)
140
141
        log = self._get_log()
141
142
        self.failUnless('All changes applied successfully.\n' in log)
 
143
 
 
144
    def test_merge_inner_conflicts(self):
 
145
        tree_a = self.make_branch_and_tree('a')
 
146
        tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
 
147
        merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
 
148
        self.assertEqual(1, len(tree_a.conflicts()))