/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Robert Collins
  • Date: 2008-02-06 04:06:42 UTC
  • mfrom: (3216 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3217.
  • Revision ID: robertc@robertcollins.net-20080206040642-2efx3l4iv5f95lxp
Merge up with bzr.dev.

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,
29
30
    ParentLoop,
30
31
    PathConflict,
31
32
    TextConflict,
56
57
    ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
57
58
               None, '\xc3\xaed2e'),
58
59
    UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
 
60
    NonDirectoryParent('Created directory', u'p\xe5thg', '\xc3\xaedg'),
59
61
])
60
62
 
61
63