com.aragost.javahg.merge
Class ConflictResolvingContext

java.lang.Object
  com.aragost.javahg.merge.ConflictResolvingContext

Direct Known Subclasses:

BackoutConflictResolvingContext, GraftContext, MergeContext

public abstract class ConflictResolvingContext
extends Object

Base class for a context where conflicts are resolved.

That is for example after a merge or graft.

Constructor Summary

ConflictResolvingContext(AbstractCommand command)

Method Summary

Changeset	getBase()
AbstractCommand	getCommand()
Collection<FlagConflict>	getFlagConflicts()
List<KeepDeleteConflict>	getKeepDeleteConflicts()
Changeset	getLocal()
List<MergeConflict>	getMergeConflicts()
Changeset	getRemote()
Repository	getRepository()
WorkingCopy	getWorkingCopy()
void	processStream(HgInputStream in, boolean whenUnknowReturn) Read input from the stream record conflicts.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ConflictResolvingContext

public ConflictResolvingContext(AbstractCommand command)

Method Detail

getWorkingCopy

public WorkingCopy getWorkingCopy()

getFlagConflicts

public Collection<FlagConflict> getFlagConflicts()

getKeepDeleteConflicts

public List<KeepDeleteConflict> getKeepDeleteConflicts()

getMergeConflicts

public List<MergeConflict> getMergeConflicts()

getRepository

public Repository getRepository()

getCommand

public AbstractCommand getCommand()

processStream

public void processStream(HgInputStream in,
                          boolean whenUnknowReturn)
                   throws IOException

Read input from the stream record conflicts.

Parameters:

in -

whenUnknowReturn -

Throws:

IOException

getLocal

public Changeset getLocal()

getRemote

public Changeset getRemote()

getBase

public Changeset getBase()