public class SVNMergeResult
extends java.lang.Object
Modifier and Type | Method and Description |
---|---|
static SVNMergeResult |
createMergeResult(SVNStatusType status,
SVNConflictReason reason)
Creates a new merge result object.
|
SVNConflictReason |
getConflictReason()
Returns conflict reason.
|
SVNStatusType |
getMergeStatus()
Returns merge status.
|
public static SVNMergeResult createMergeResult(SVNStatusType status, SVNConflictReason reason)
status
is not SVNStatusType.CONFLICTED
, reason
is irrelevant and
always set to null. If status
is SVNStatusType.CONFLICTED
and reason
is null, then reason
defaults to
SVNConflictReason.EDITED
.status
- status of merge operationreason
- reason of the conflict (if any)public SVNStatusType getMergeStatus()
public SVNConflictReason getConflictReason()
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.