Module b.conflicts

Part of bzrlib

No module docstring

Line #	Kind	Name	Docs
43	Class	cmd_conflicts	List files with conflicts.
76	Class	cmd_resolve	Mark a conflict as resolved.
120	Function	resolve	Resolve some or all of the conflicts in a working tree.
152	Function	restore	Restore a conflicted file to the state it was in before merging.
180	Class	ConflictList	List of conflicts.
303	Class	Conflict	Base class for all types of conflict
361	Class	PathConflict	A conflict was encountered merging file paths
380	Class	ContentsConflict	The files are of different types, or not present
390	Class	TextConflict	The merge algorithm could not resolve all differences encountered.
400	Class	HandledConflict	A path problem that has been provisionally resolved.
420	Class	HandledPathConflict	A provisionally-resolved path problem involving two paths.
450	Class	DuplicateID	Two files want the same file_id.
458	Class	DuplicateEntry	Two directory entries want to have the same name.
466	Class	ParentLoop	An attempt to create an infinitely-looping directory structure.
482	Class	UnversionedParent	An attempt to version an file whose parent directory is not versioned.
494	Class	MissingParent	An attempt to add files to a directory that is not present.
506	Class	DeletingParent	An attempt to add files to a directory that is not present.
518	Class	NonDirectoryParent	An attempt to add files to a directory that is not a director or
531	Function	register_types	Register a Conflict subclass for serialization purposes

def resolve(tree, paths=None, ignore_misses=False, recursive=False):

Resolve some or all of the conflicts in a working tree.

Parameters	paths	If None, resolve all conflicts. Otherwise, select only specified conflicts.
	recursive	If 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.
Unknown Field: ignore_misses	If False, warnings will be printed if the supplied paths do not have conflicts.

def restore(filename):

Restore a conflicted file to the state it was in before merging. Only text restoration supported at present.

def register_types(*conflict_types):

Register a Conflict subclass for serialization purposes

API Documentation for BzrLib, generated by pydoctor at 2008-06-25 00:00:15.