All Methods Static Methods Concrete Methods
Modifier and Type |
Method and Description |
static void |
addPropConflict(SVNSkel skel,
ISVNWCDb db,
File wriAbsPath,
File markerAbsPath,
SVNProperties mineProps,
SVNProperties theirOldProps,
SVNProperties theirProps,
Collection<String> conflictedPropNames) |
static void |
addPropConflict(SVNSkel skel,
String propName,
SVNPropertyValue originalVal,
SVNPropertyValue mineVal,
SVNPropertyValue incomingVal,
SVNPropertyValue incomingBaseVal) |
static void |
addTextConflict(SVNSkel skel,
ISVNWCDb db,
File wriAbsPath,
File mineAbsPath,
File theirOldAbsPath,
File theirAbsPath) |
static void |
addTreeConflict(SVNSkel skel,
ISVNWCDb db,
File wriAbsPath,
SVNConflictReason localChange,
SVNConflictAction incomingChange,
File moveSrcOpRootAbsPath) |
static void |
conflictSkelOpMerge(SVNSkel conflictSkel,
SVNConflictVersion original,
SVNConflictVersion target) |
static void |
conflictSkelOpSwitch(SVNSkel conflictSkel,
SVNConflictVersion original,
SVNConflictVersion target) |
static void |
conflictSkelOpUpdate(SVNSkel conflictSkel,
SVNConflictVersion original,
SVNConflictVersion target) |
static boolean |
conflictSkelResolve(SVNSkel conflictSkel,
ISVNWCDb db,
File wriAbsPAth,
boolean resolveText,
String resolveProp,
boolean resolveTree) |
static List<SVNWCConflictDescription17> |
convertFromSkel(SVNWCDb db,
File localAbsPath,
boolean createTempFiles,
SVNSkel conflictSkel) |
static SVNSkel |
convertToConflictSkel(File wcRootAbsPath,
SVNWCDb db,
String localRelpath,
String conflictOld,
String conflictWorking,
String conflictNew,
String propReject,
byte[] treeConflictData) |
static SVNSkel |
convertToConflictSkel(String conflictOld,
String conflictWorking,
String conflictNew,
String propReject,
byte[] treeConflictData) |
static SVNSkel |
createConflictMarkers(ISVNWCDb db,
File localAbsPath,
SVNSkel conflictSkel) |
static SVNSkel |
createConflictSkel() |
static SVNSkel |
getConflict(SVNSkel conflictSkel,
SvnWcDbConflicts.ConflictKind kind) |
static Structure<SvnWcDbConflicts.ConflictStatus> |
getConflictStatusForUpdate(SVNWCDb db,
File localAbsPath,
boolean treeConflictOnly) |
static boolean |
isConflictSkelComplete(SVNSkel skel) |
static void |
prependLocation(SVNSkel skel,
SVNConflictVersion location) |
static void |
prependPropValue(SVNPropertyValue fromVal,
SVNSkel skel) |
static SVNSkel |
readConflict(SVNWCDb db,
File localAbspath) |
static Structure<SvnWcDbConflicts.ConflictInfo> |
readConflictInfo(SVNSkel conflictSkel) |
static SVNSkel |
readConflictInternal(SVNWCDbRoot wcRoot,
File localRelPath) |
static List<File> |
readConflictMarkers(SVNWCDb db,
File wriAbsPath,
SVNSkel conflictSkel) |
static Structure<SvnWcDbConflicts.PropertyConflictInfo> |
readPropertyConflict(ISVNWCDb db,
File wriAbsPath,
SVNSkel conflictSkel) |
static void |
readPropertyConflicts(List<SVNWCConflictDescription17> target,
SVNWCDb db,
File localAbsPath,
SVNSkel conflictSkel,
boolean createTempFiles,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion) |
static Structure<SvnWcDbConflicts.TextConflictInfo> |
readTextConflict(ISVNWCDb db,
File wriAbsPath,
SVNSkel conflictSkel) |
static Structure<SvnWcDbConflicts.TreeConflictInfo> |
readTreeConflict(ISVNWCDb db,
File wriAbsPath,
SVNSkel conflictSkel) |
static void |
setConflictOperation(SVNSkel skel,
SVNOperation operation,
SVNConflictVersion original,
SVNConflictVersion target) |
static SVNSkel |
treeConflictDescriptionToSkel(ISVNWCDb db,
File wriAbsPath,
SVNTreeConflictDescription conflictDescription) |
static SVNSkel |
upgradeConflictSkelFromRaw(ISVNWCDb db,
File wriAbsPath,
File localRelPath,
String conflictOld,
String conflictWork,
String conflictNew,
File prejFile,
SVNSkel oldTreeConflictData) |