← 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: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
45
45
# u'\xe5' == a with circle
46
46
# '\xc3\xae' == u'\xee' == i with hat
47
47
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
48
 
example_conflicts = ConflictList([ 
 
48
example_conflicts = ConflictList([
49
49
    MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
50
 
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'), 
 
50
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
51
51
    TextConflict(u'p\xe5tha'),
52
52
    PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
53
53
    DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',