protected Map getMergeInfo(SVNURL url, SVNRevision pegRevision, SVNURL repositoryRoot[]) throws SVNException { SVNRepository repository = null; try { repository = createRepository(url, null, null, true); long revisionNum = getRevisionNumber(pegRevision, repository, null); SVNURL reposRoot = repository.getRepositoryRoot(true); if (repositoryRoot != null && repositoryRoot.length > 0) { repositoryRoot[0] = reposRoot; } String relPath = getPathRelativeToRoot(null, url, reposRoot, null, null); return getReposMergeInfo(repository, relPath, revisionNum, SVNMergeInfoInheritance.INHERITED, false); } finally { if (repository != null) { repository.closeSession(); } } }
private List normalizeMergeSources(File source, SVNURL sourceURL, SVNURL sourceRootURL, SVNRevision pegRevision, Collection rangesToMerge, SVNRepository repository) throws SVNException { long youngestRevision[] = { SVNRepository.INVALID_REVISION }; long pegRevNum = getRevisionNumber(pegRevision, youngestRevision, repository, source); if (!SVNRevision.isValidRevisionNumber(pegRevNum)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION); long rangeStartRev = getRevisionNumber(rangeStart, youngestRevision, repository, source); long rangeEndRev = getRevisionNumber(rangeEnd, youngestRevision, repository, source); if (rangeStartRev != rangeEndRev) { SVNMergeRange range = new SVNMergeRange(rangeStartRev, rangeEndRev, true);
private List normalizeMergeSources(File source, SVNURL sourceURL, SVNURL sourceRootURL, SVNRevision pegRevision, Collection rangesToMerge, SVNRepository repository) throws SVNException { long youngestRevision[] = { SVNRepository.INVALID_REVISION }; long pegRevNum = getRevisionNumber(pegRevision, youngestRevision, repository, source); if (!SVNRevision.isValidRevisionNumber(pegRevNum)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION); long rangeStartRev = getRevisionNumber(rangeStart, youngestRevision, repository, source); long rangeEndRev = getRevisionNumber(rangeEnd, youngestRevision, repository, source); if (rangeStartRev != rangeEndRev) { SVNMergeRange range = new SVNMergeRange(rangeStartRev, rangeEndRev, true);
protected Map getMergeInfo(SVNURL url, SVNRevision pegRevision, SVNURL repositoryRoot[]) throws SVNException { SVNRepository repository = null; try { repository = createRepository(url, null, null, true); long revisionNum = getRevisionNumber(pegRevision, repository, null); SVNURL reposRoot = repository.getRepositoryRoot(true); if (repositoryRoot != null && repositoryRoot.length > 0) { repositoryRoot[0] = reposRoot; } String relPath = getPathRelativeToSession(url, null, repository); if (relPath == null) { repository.setLocation(url, false); relPath = ""; } return getReposMergeInfo(repository, relPath, revisionNum, SVNMergeInfoInheritance.INHERITED, false); } finally { if (repository != null) { repository.closeSession(); } } }
private List normalizeMergeSources(File source, SVNURL sourceURL, SVNURL sourceRootURL, SVNRevision pegRevision, Collection rangesToMerge, SVNRepository repository) throws SVNException { long youngestRevision[] = { SVNRepository.INVALID_REVISION }; long pegRevNum = getRevisionNumber(pegRevision, youngestRevision, repository, source); if (!SVNRevision.isValidRevisionNumber(pegRevNum)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION); long rangeStartRev = getRevisionNumber(rangeStart, youngestRevision, repository, source); long rangeEndRev = getRevisionNumber(rangeEnd, youngestRevision, repository, source); if (rangeStartRev != rangeEndRev) { SVNMergeRange range = new SVNMergeRange(rangeStartRev, rangeEndRev, true);
protected Map getMergeInfo(SVNURL url, SVNRevision pegRevision, SVNURL repositoryRoot[]) throws SVNException { SVNRepository repository = null; try { repository = createRepository(url, null, null, true); long revisionNum = getRevisionNumber(pegRevision, repository, null); SVNURL reposRoot = repository.getRepositoryRoot(true); if (repositoryRoot != null && repositoryRoot.length > 0) { repositoryRoot[0] = reposRoot; } String relPath = getPathRelativeToSession(url, null, repository); if (relPath == null) { repository.setLocation(url, false); relPath = ""; } return getReposMergeInfo(repository, relPath, revisionNum, SVNMergeInfoInheritance.INHERITED, false); } finally { if (repository != null) { repository.closeSession(); } } }
long rev1 = getRevisionNumber(revision1, latestRev, repository1, null); long rev2 = getRevisionNumber(revision2, latestRev, repository2, null);
long rev1 = getRevisionNumber(revision1, latestRev, repository1, null); long rev2 = getRevisionNumber(revision2, latestRev, repository2, null);
long rev1 = getRevisionNumber(revision1, latestRev, repository1, null); long rev2 = getRevisionNumber(revision2, latestRev, repository2, null);
myWCAccess.walkEntries(targetWCPath, handler, true, SVNDepth.INFINITY); long rev2 = getRevisionNumber(pegRevision, sourceRepository, srcPath); SVNURL[] url1 = { null };
myWCAccess.walkEntries(targetWCPath, handler, true, SVNDepth.INFINITY); long rev2 = getRevisionNumber(pegRevision, repository, srcPath); SVNURL[] url1 = { null };
myWCAccess.walkEntries(targetWCPath, handler, true, SVNDepth.INFINITY); long rev2 = getRevisionNumber(pegRevision, repository, srcPath); SVNURL[] url1 = { null };