ranges.add(range); repository1.setLocation(url1, false); removeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository1); sRev = eRev; eRev = SVNRevision.create(rev2); ranges.add(range); repository2.setLocation(url2, false); addSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository2);
ranges.add(range); repository.setLocation(url1, false); removeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository); sRev = eRev; eRev = SVNRevision.create(rev2); ranges.add(range); repository.setLocation(url2, false); addSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository); } finally {
ranges.add(range); repository.setLocation(url1, false); removeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository); sRev = eRev; eRev = SVNRevision.create(rev2); ranges.add(range); repository.setLocation(url2, false); addSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository); } finally {
repository = createRepository(url, null, null, true); sourceReposRoot = repository.getRepositoryRoot(true); mergeSources = normalizeMergeSources(srcPath, url, sourceReposRoot, pegRevision, rangesToMerge, repository); } finally {
repository = createRepository(url, null, null, true); sourceReposRoot = repository.getRepositoryRoot(true); mergeSources = normalizeMergeSources(srcPath, url, sourceReposRoot, pegRevision, rangesToMerge, repository); } finally {
repository = createRepository(url, null, null, true); sourceReposRoot = repository.getRepositoryRoot(true); mergeSources = normalizeMergeSources(srcPath, url, sourceReposRoot, pegRevision, rangesToMerge, repository); } finally {
range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository1); } else if (youngestCommonURL.equals(url1) && youngestCommonRevision == rev1) { range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository2); } else {
range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository1); } else if (youngestCommonURL.equals(url1) && youngestCommonRevision == rev1) { range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository2); } else {
range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository1); } else if (youngestCommonURL.equals(url1) && youngestCommonRevision == rev1) { range = new SVNRevisionRange(sRev, eRev); ranges.add(range); mergeSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev, ranges, repository2); } else {