← 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: Aaron Bentley
  • Date: 2007-12-09 23:53:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209235350-qp39yk0xzx7a4f6p
Don't use the base if not cherrypicking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
26
26
    DuplicateID,
27
27
    DuplicateEntry,
28
28
    MissingParent,
29
 
    NonDirectoryParent,
30
29
    ParentLoop,
31
30
    PathConflict,
32
31
    TextConflict,
57
56
    ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
58
57
               None, '\xc3\xaed2e'),
59
58
    UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
60
 
    NonDirectoryParent('Created directory', u'p\xe5thg', '\xc3\xaedg'),
61
59
])
62
60
 
63
61
 
85
83
        restore('hello.sploo')
86
84
        self.assertEqual(len(tree.conflicts()), 0)
87
85
        self.assertFileEqual('hello world2', 'hello')
88
 
        self.assertFalse(os.path.lexists('hello.sploo'))
 
86
        assert not os.path.lexists('hello.sploo')
89
87
        self.assertRaises(NotConflicted, restore, 'hello')
90
88
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
91
89