← 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-07-12 18:05:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1871.
  • Revision ID: john@arbash-meinel.com-20060712180501-1a638c0c5b1e7646
Updated WorkingTree to use the new user-level ignores.

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