b.conflicts : module documentation

Part of bzrlib

No module docstring
Class cmd_conflicts Undocumented
Class ResolveActionOption Undocumented
Class cmd_resolve Undocumented
Function resolve Resolve some or all of the conflicts in a working tree.
Function restore Restore a conflicted file to the state it was in before merging.
Class ConflictList List of conflicts.
Class Conflict Base class for all types of conflict
Class PathConflict A conflict was encountered merging file paths
Class ContentsConflict The files are of different types (or both binary), or not present
Class TextConflict The merge algorithm could not resolve all differences encountered.
Class HandledConflict A path problem that has been provisionally resolved.
Class HandledPathConflict A provisionally-resolved path problem involving two paths.
Class DuplicateID Two files want the same file_id.
Class DuplicateEntry Two directory entries want to have the same name.
Class ParentLoop An attempt to create an infinitely-looping directory structure.
Class UnversionedParent An attempt to version a file whose parent directory is not versioned.
Class MissingParent An attempt to add files to a directory that is not present.
Class DeletingParent An attempt to add files to a directory that is not present.
Class NonDirectoryParent An attempt to add files to a directory that is not a directory or
Function register_types Register a Conflict subclass for serialization purposes
def resolve(tree, paths=None, ignore_misses=False, recursive=False, action='done'):
Resolve some or all of the conflicts in a working tree.
ParameterspathsIf None, resolve all conflicts. Otherwise, select only specified conflicts.
recursiveIf True, then elements of paths which are directories have all their children resolved, etc. When invoked as part of recursive commands like revert, this should be True. For commands or applications wishing finer-grained control, like the resolve command, this should be False.
ignore_missesIf False, warnings will be printed if the supplied paths do not have conflicts.
actionHow the conflict should be resolved,
def restore(filename):
Restore a conflicted file to the state it was in before merging.

Only text restoration is supported at present.

def register_types(*conflict_types):
Register a Conflict subclass for serialization purposes
API Documentation for Bazaar, generated by pydoctor at 2014-07-30 00:01:36.