← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
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
    """