← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-25 10:54:06 UTC
  • mfrom: (5113.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100325105406-d1nspg0ryp7ebxm7
(vila) Add XFAIL tests for bug #537956

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
555
555
 
556
556
 
557
557
class ContentsConflict(PathConflict):
558
 
    """The files are of different types, or not present"""
 
558
    """The files are of different types (or both binary), or not present"""
559
559
 
560
560
    has_files = True
561
561
 
707
707
 
708
708
    typestring = 'parent loop'
709
709
 
710
 
    format = 'Conflict moving %(conflict_path)s into %(path)s.  %(action)s.'
 
710
    format = 'Conflict moving %(path)s into %(conflict_path)s. %(action)s.'
711
711
 
712
712
    def action_take_this(self, tree):
713
713
        # just acccept bzr proposal