public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException { SVNConflictResult result = null; if (myConflictResolverCallback != null) { ConflictDescriptor descriptor = JavaHLObjectFactory.createConflictDescription(conflictDescription); try { result = JavaHLObjectFactory.getSVNConflictResult(myConflictResolverCallback.resolve(descriptor)); } catch (SubversionException e) { SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e), e, SVNLogType.DEFAULT); } } return result; } };
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException { SVNConflictResult result = null; if (myConflictResolverCallback != null) { ConflictDescriptor descriptor = JavaHLObjectFactory.createConflictDescription(conflictDescription); try { result = JavaHLObjectFactory.getSVNConflictResult(myConflictResolverCallback.resolve(descriptor)); } catch (SubversionException e) { SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e), e, SVNLogType.DEFAULT); } } return result; } };
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException { SVNConflictResult result = null; if (myConflictResolverCallback != null) { ConflictDescriptor descriptor = JavaHLObjectFactory.createConflictDescription(conflictDescription); try { result = JavaHLObjectFactory.getSVNConflictResult(myConflictResolverCallback.resolve(descriptor)); } catch (SubversionException e) { SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e), e, SVNLogType.DEFAULT); } } return result; } };
info.getChangelistName(), info.getWorkingSize(), info.getRepositorySize(), depth, createConflictDescription(info.getTreeConflict()) );
repositoryTextStatus, repositoryPropStatus, locked, copied, tc != null, createConflictDescription(tc), conflictOld, conflictNew, conflictWorking, urlCopiedFrom, revisionCopiedFrom, switched, false, lockToken, lockOwner, lockComment, lockCreationDate, reposLock,
repositoryTextStatus, repositoryPropStatus, locked, copied, tc != null, createConflictDescription(tc), conflictOld, conflictNew, conflictWorking, urlCopiedFrom, revisionCopiedFrom, switched, false, lockToken, lockOwner, lockComment, lockCreationDate, reposLock,
repositoryTextStatus, repositoryPropStatus, locked, copied, tc != null, createConflictDescription(tc), conflictOld, conflictNew, conflictWorking, urlCopiedFrom, revisionCopiedFrom, switched, false, lockToken, lockOwner, lockComment, lockCreationDate, reposLock,
repositoryTextStatus, repositoryPropStatus, locked, copied, tc != null, createConflictDescription(tc), conflictOld, conflictNew, conflictWorking, urlCopiedFrom, revisionCopiedFrom, switched, false, lockToken, lockOwner, lockComment, lockCreationDate, reposLock,