Package org.tmatesoft.svn.cli.svn

Class SVNConflictAcceptPolicy

java.lang.Object

org.tmatesoft.svn.cli.svn.SVNConflictAcceptPolicy

public class SVNConflictAcceptPolicy
extends java.lang.Object

Version:

1.3

Author:

TMate Software Ltd.

Field Summary

Fields

Modifier and Type	Field	Description
static SVNConflictAcceptPolicy	BASE	Resolve the conflict with the pre-conflict base file.
static SVNConflictAcceptPolicy	EDIT
static SVNConflictAcceptPolicy	INVALID
static SVNConflictAcceptPolicy	LAUNCH
static SVNConflictAcceptPolicy	MINE_CONFLICT	Resolve the conflict with the pre-conflict working copy file.
static SVNConflictAcceptPolicy	MINE_FULL
static SVNConflictAcceptPolicy	POSTPONE
static SVNConflictAcceptPolicy	THEIRS_CONFLICT	Resolve the conflict with the post-conflict base file.
static SVNConflictAcceptPolicy	THEIRS_FULL
static SVNConflictAcceptPolicy	UNSPECIFIED
static SVNConflictAcceptPolicy	WORKING

Method Summary

Modifier and Type	Method	Description
static SVNConflictAcceptPolicy	fromString(java.lang.String accept)
java.lang.String	toString()

Methods inherited from class java.lang.Object

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

Field Detail

INVALID

public static final SVNConflictAcceptPolicy INVALID

UNSPECIFIED

public static final SVNConflictAcceptPolicy UNSPECIFIED

BASE

public static final SVNConflictAcceptPolicy BASE

Resolve the conflict with the pre-conflict base file.

MINE_CONFLICT

public static final SVNConflictAcceptPolicy MINE_CONFLICT

Resolve the conflict with the pre-conflict working copy file.

MINE_FULL

public static final SVNConflictAcceptPolicy MINE_FULL

WORKING

public static final SVNConflictAcceptPolicy WORKING

THEIRS_CONFLICT

public static final SVNConflictAcceptPolicy THEIRS_CONFLICT

Resolve the conflict with the post-conflict base file.

THEIRS_FULL

public static final SVNConflictAcceptPolicy THEIRS_FULL

POSTPONE

public static final SVNConflictAcceptPolicy POSTPONE

EDIT

public static final SVNConflictAcceptPolicy EDIT

LAUNCH

public static final SVNConflictAcceptPolicy LAUNCH

Method Detail

toString

public java.lang.String toString()

Overrides:

toString in class java.lang.Object

fromString

public static SVNConflictAcceptPolicy fromString(java.lang.String accept)