com.aragost.javahg.merge
Class KeepDeleteConflict

java.lang.Object
  com.aragost.javahg.merge.MergeFile
      com.aragost.javahg.merge.KeepDeleteConflict

public class KeepDeleteConflict
extends MergeFile

Nested Class Summary

static class

KeepDeleteConflict.State

Constructor Summary

KeepDeleteConflict(ConflictResolvingContext mergeState, String fileName, KeepDeleteConflict.State localState)

Method Summary

void	delete()
Changeset	getKeepParent()
KeepDeleteConflict.State	getState()
void	keep()
void	update(KeepDeleteConflict.State state)

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

getFile, getFilename, getMergeCtx, toString

Methods inherited from class java.lang.Object

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

Constructor Detail

KeepDeleteConflict

public KeepDeleteConflict(ConflictResolvingContext mergeState,
                          String fileName,
                          KeepDeleteConflict.State localState)

Method Detail

getState

public KeepDeleteConflict.State getState()

update

public void update(KeepDeleteConflict.State state)

keep

public void keep()

delete

public void delete()

getKeepParent

public Changeset getKeepParent()