Package | Description |
---|---|
org.apache.subversion.javahl.callback | |
org.apache.subversion.javahl.types | |
org.tigris.subversion.javahl |
Provides a (mostly native, using JNI and javah) implementation of
a high level Java API for
Subversion.
|
org.tmatesoft.svn.core.javahl17 |
Modifier and Type | Method and Description |
---|---|
ConflictResult |
ConflictResolverCallback.resolve(ConflictDescriptor descrip)
The callback method invoked for each conflict during a
merge/update/switch operation.
|
Modifier and Type | Field and Description |
---|---|
private java.util.Set<ConflictDescriptor> |
Info.conflict
Info on any tree conflict of which this node is a victim.
|
Modifier and Type | Method and Description |
---|---|
java.util.Set<ConflictDescriptor> |
Info.getConflicts() |
Constructor and Description |
---|
Info(java.lang.String path,
java.lang.String wcroot,
java.lang.String url,
long rev,
NodeKind kind,
java.lang.String reposRootUrl,
java.lang.String reposUUID,
long lastChangedRev,
long lastChangedDate,
java.lang.String lastChangedAuthor,
Lock lock,
boolean hasWcInfo,
Info.ScheduleKind schedule,
java.lang.String copyFromUrl,
long copyFromRev,
long textTime,
Checksum checksum,
java.lang.String changelistName,
long workingSize,
long reposSize,
Depth depth,
java.util.Set<ConflictDescriptor> conflict)
constructor to build the object by native code.
|
Modifier and Type | Method and Description |
---|---|
private static java.lang.String |
Info2.getConflictNew(java.util.Set<ConflictDescriptor> conflicts) |
private static java.lang.String |
Info2.getConflictOld(java.util.Set<ConflictDescriptor> conflicts) |
private static java.lang.String |
Info2.getConflictWrk(java.util.Set<ConflictDescriptor> conflicts) |
private static java.lang.String |
Info2.getPrejfile(java.util.Set<ConflictDescriptor> conflicts) |
private static ConflictDescriptor |
Info2.getTreeConflict(java.util.Set<ConflictDescriptor> conflicts) |
Constructor and Description |
---|
ConflictDescriptor(ConflictDescriptor aDesc) |
Modifier and Type | Method and Description |
---|---|
private ConflictDescriptor |
SVNClientImpl.getConflictDescription(SVNConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
private java.util.Set<ConflictDescriptor> |
SVNClientImpl.getConflictDescriptors(java.util.Collection<SVNConflictDescription> conflicts) |