com.aragost.javahg.merge
Class BackoutConflictResolvingContext

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

public class BackoutConflictResolvingContext
extends ConflictResolvingContext

Constructor Summary

BackoutConflictResolvingContext(AbstractCommand command, boolean merge)

Method Summary

void	processStream(HgInputStream in, boolean whenUnknowReturn) Example:

Methods inherited from class com.aragost.javahg.merge.ConflictResolvingContext

getBase, getCommand, getFlagConflicts, getKeepDeleteConflicts, getLocal, getMergeConflicts, getRemote, getRepository, getWorkingCopy

Methods inherited from class java.lang.Object

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

Constructor Detail

BackoutConflictResolvingContext

public BackoutConflictResolvingContext(AbstractCommand command,
                                       boolean merge)

Method Detail

processStream

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

Example:

 $ hg backout --merge 7:7
 reverting foo.txt
 created new head
 changeset 9:664c3e4cbb2b backs out changeset 7:3f5bacea93aa
 merging with changeset 9:664c3e4cbb2b
 merging foo.txt
 warning: conflicts during merge.
 merging foo.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
 

Overrides:

processStream in class ConflictResolvingContext

Throws:

IOException

See Also:

ConflictResolvingContext.processStream(com.aragost.javahg.internals.HgInputStream, boolean)