← 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: Canonical.com Patch Queue Manager
  • Date: 2006-04-12 06:22:44 UTC
  • mfrom: (1558.12.10 fix-mergesums)
  • Revision ID: pqm@pqm.ubuntu.com-20060412062244-b1ea5860b8463060
Minor bugfixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
64
64
        self.assertRaises(NotConflicted, restore, 'hello')
65
65
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
66
66
 
 
67
    def test_resolve_conflict_dir(self):
 
68
        tree = self.make_branch_and_tree('.')
 
69
        b = tree.branch
 
70
        file('hello', 'w').write('hello world4')
 
71
        tree.add('hello', 'q')
 
72
        file('hello.THIS', 'w').write('hello world2')
 
73
        file('hello.BASE', 'w').write('hello world1')
 
74
        os.mkdir('hello.OTHER')
 
75
        l = ConflictList([TextConflict('hello')])
 
76
        l.remove_files(tree)
 
77
 
67
78
 
68
79
class TestConflictStanzas(TestCase):
69
80
    def test_stanza_roundtrip(self):