/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/conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:36:23 UTC
  • mfrom: (4953 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112223623-836x5mou0gm5vsep
merge bzr.dev 4953 to clean up the ui factory issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
58
58
            Option('text',
59
59
                   help='List paths of files with text conflicts.'),
60
60
        ]
61
 
    _see_also = ['resolve']
 
61
    _see_also = ['resolve', 'conflict-types']
62
62
 
63
63
    def run(self, text=False):
64
64
        from bzrlib.workingtree import WorkingTree
148
148
 
149
149
 
150
150
def restore(filename):
151
 
    """\
152
 
    Restore a conflicted file to the state it was in before merging.
153
 
    Only text restoration supported at present.
 
151
    """Restore a conflicted file to the state it was in before merging.
 
152
 
 
153
    Only text restoration is supported at present.
154
154
    """
155
155
    conflicted = False
156
156
    try:
478
478
 
479
479
 
480
480
class UnversionedParent(HandledConflict):
481
 
    """An attempt to version an file whose parent directory is not versioned.
 
481
    """An attempt to version a file whose parent directory is not versioned.
482
482
    Typically, the result of a merge where one tree unversioned the directory
483
483
    and the other added a versioned file to it.
484
484
    """