~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

• browse files at revision 3118
• compare with another revision
• download diff
• download tarball
• view history from revision 3118

• reverse the comparison (3118 to 3641.5.3)
• stop comparing with revision 3641.5.3

Show diffs side-by-side

added

removed

bzrlib/conflicts.py

1

 

# Copyright (C) 2005, 2007 Canonical Ltd

 

1

# Copyright (C) 2005 Aaron Bentley, Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

515

515

             "%(action)s."

516

516

 

517

517

 

518

 

class NonDirectoryParent(HandledConflict):

519

 

    """An attempt to add files to a directory that is not a director or

520

 

    an attempt to change the kind of a directory with files.

521

 

    """

522

 

 

523

 

    typestring = 'non-directory parent'

524

 

 

525

 

    format = "Conflict: %(path)s is not a directory, but has files in it."\

526

 

             "  %(action)s."

527

 

 

528

518

ctype = {}

529

519

 

530

520

 

537

527

 

538

528

register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,

539

529

               DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,

540

 

               DeletingParent, NonDirectoryParent)

 

530

               DeletingParent,)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1