Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc17 | |
org.tmatesoft.svn.core.internal.wc17.db | |
org.tmatesoft.svn.core.internal.wc2.ng |
Modifier and Type | Method and Description |
---|---|
static SVNWCConflictDescription17 |
SVNWCConflictDescription17.createProp(java.io.File localAbspath,
SVNNodeKind nodeKind,
java.lang.String propertyName) |
static SVNWCConflictDescription17 |
SVNWCConflictDescription17.createText(java.io.File localAbspath) |
static SVNWCConflictDescription17 |
SVNWCConflictDescription17.createTree(java.io.File localAbspath,
SVNNodeKind nodeKind,
SVNOperation operation,
SVNConflictVersion srcLeftVersion,
SVNConflictVersion srcRightVersion) |
Modifier and Type | Method and Description |
---|---|
void |
SVNWCContext.addTreeConflict(SVNWCConflictDescription17 conflict) |
Modifier and Type | Method and Description |
---|---|
static java.util.List<SVNWCConflictDescription17> |
SvnWcDbConflicts.convertFromSkel(SVNWCDb db,
java.io.File localAbsPath,
boolean createTempFiles,
SVNSkel conflictSkel) |
java.util.List<SVNWCConflictDescription17> |
SVNWCDb.readConflicts(java.io.File localAbsPath,
boolean createTempFiles) |
private java.util.List<SVNWCConflictDescription17> |
SVNWCDb.readConflicts17(SVNWCDbRoot wcRoot,
java.io.File localRelPath,
boolean createTempFiles) |
Modifier and Type | Method and Description |
---|---|
static void |
SvnWcDbConflicts.readPropertyConflicts(java.util.List<SVNWCConflictDescription17> target,
SVNWCDb db,
java.io.File localAbsPath,
SVNSkel conflictSkel,
boolean createTempFiles,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion) |
Modifier and Type | Field and Description |
---|---|
private java.util.Map<java.io.File,SVNWCConflictDescription17> |
SvnNgMergeCallback2.DirectoryBaton.newTreeConflicts |
Modifier and Type | Method and Description |
---|---|
private void |
SvnNgMergeCallback2.recordTreeConflict(java.io.File localAbsPath,
SvnNgMergeCallback2.DirectoryBaton parentBaton,
SVNNodeKind nodeKind,
SVNConflictAction action,
SVNConflictReason reason,
SVNWCConflictDescription17 existingConflict,
boolean notifyTreeConflict) |