List fauxSources = new LinkedList(); fauxSources.add(fauxSource); doMerge(null, fauxSources, targetWCPath, entry, adminArea, false, true, sourceReposRoot.equals(wcReposRoot), ignoreAncestry, force, dryRun, false, true, depth); Map addResultsCatalog = new TreeMap(); Map removeResultsCatalog = new TreeMap(); doMerge(addResultsCatalog, addSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth); doMerge(removeResultsCatalog, removeSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth); SVNMergeInfoUtil.mergeCatalog(addResultsCatalog, removeResultsCatalog);
List fauxSources = new LinkedList(); fauxSources.add(fauxSource); doMerge(fauxSources, targetWCPath, entry, adminArea, false, true, sourceReposRoot.equals(wcReposRoot), ignoreAncestry, force, dryRun, false, true, depth); doMerge(addSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth); doMerge(removeSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth);
List fauxSources = new LinkedList(); fauxSources.add(fauxSource); doMerge(fauxSources, targetWCPath, entry, adminArea, false, true, sourceReposRoot.equals(wcReposRoot), ignoreAncestry, force, dryRun, false, true, depth); doMerge(addSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth); doMerge(removeSources, targetWCPath, entry, adminArea, true, true, sameRepos, ignoreAncestry, force, dryRun, true, true, depth);
doMerge(mergeSources, targetWCPath, targetEntry, adminArea, true, true, wcReposRoot.equals(sourceReposRoot), ignoreAncestry, force, dryRun, recordOnly, false, depth);
doMerge(null, mergeSources, targetWCPath, targetEntry, adminArea, true, true, wcReposRoot.equals(sourceReposRoot), ignoreAncestry, force, dryRun, recordOnly, false, depth);
doMerge(mergeSources, targetWCPath, targetEntry, adminArea, true, true, wcReposRoot.equals(sourceReposRoot), ignoreAncestry, force, dryRun, recordOnly, false, depth);
repository2.closeSession(); doMerge(null, mergeSources, targetWCPath, entry, adminArea, ancestral, related, sameRepos, ignoreAncestry, force, dryRun, recordOnly, false, depth); } finally {
repository2.closeSession(); doMerge(mergeSources, targetWCPath, entry, adminArea, ancestral, related, sameRepos, ignoreAncestry, force, dryRun, recordOnly, false, depth); } finally {
repository2.closeSession(); doMerge(mergeSources, targetWCPath, entry, adminArea, ancestral, related, sameRepos, ignoreAncestry, force, dryRun, recordOnly, false, depth); } finally {