← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir
21
20
from bzrlib.tests import TestCaseWithTransport, TestCase
22
21
from bzrlib.branch import Branch
23
 
from bzrlib.conflicts import (MissingParent, ContentsConflict, TextConflict,
24
 
        PathConflict, DuplicateID, DuplicateEntry, ParentLoop, UnversionedParent,
25
 
        ConflictList, 
26
 
        restore)
 
22
from bzrlib.conflicts import *
27
23
from bzrlib.errors import NotConflicted
28
24
 
29
25
 
50
46
    def test_conflicts(self):
51
47
        """Conflicts are detected properly"""
52
48
        tree = self.make_branch_and_tree('.',
53
 
            format=bzrdir.BzrDirFormat6())
 
49
            format=bzrlib.bzrdir.BzrDirFormat6())
54
50
        b = tree.branch
55
51
        file('hello', 'w').write('hello world4')
56
52
        file('hello.THIS', 'w').write('hello world2')