Package org.tmatesoft.svn.cli.svn

Class SVNConflictAcceptPolicy

java.lang.Object

org.tmatesoft.svn.cli.svn.SVNConflictAcceptPolicy

public class SVNConflictAcceptPolicy
extends Object

Version:

1.3

Field Summary

Fields

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

Constructor Summary

Constructors

Modifier	Constructor	Description
private	SVNConflictAcceptPolicy(String name)

Method Summary

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

Methods inherited from class java.lang.Object

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

Field Details

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

myName

private String myName

Constructor Details

SVNConflictAcceptPolicy

private SVNConflictAcceptPolicy(String name)

Method Details

toString

public String toString()

Overrides:

toString in class Object

fromString

public static SVNConflictAcceptPolicy fromString(String accept)