protected void doMergeInfoUnawareDirectoryMerge(SVNURL url1, long revision1, SVNURL url2, long revision2, SVNAdminArea adminArea, SVNDepth depth) throws SVNException { File targetWCPath = adminArea.getRoot(); boolean isRollBack = revision1 > revision2; MergePath item = new MergePath(targetWCPath); SVNMergeRange itemRange = new SVNMergeRange(revision1, revision2, true); item.myRemainingRanges = new SVNMergeRangeList(itemRange); myChildrenWithMergeInfo.add(item); driveMergeReportEditor(targetWCPath, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, getMergeCallback(adminArea), null); }
protected void doMergeInfoUnawareDirectoryMerge(SVNURL url1, long revision1, SVNURL url2, long revision2, SVNAdminArea adminArea, SVNDepth depth) throws SVNException { File targetWCPath = adminArea.getRoot(); boolean isRollBack = revision1 > revision2; MergePath item = new MergePath(targetWCPath); SVNMergeRange itemRange = new SVNMergeRange(revision1, revision2, true); item.myRemainingRanges = new SVNMergeRangeList(itemRange); myChildrenWithMergeInfo.add(item); driveMergeReportEditor(targetWCPath, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, getMergeCallback(adminArea), null); }
myChildrenWithMergeInfo.add(item); driveMergeReportEditor(targetWCPath, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, mergeCallback, null); return; editor = driveMergeReportEditor(myTarget, realURL1, startRev, realURL2, endRev, myChildrenWithMergeInfo, isRollBack, depth, adminArea, mergeCallback, editor); } finally { if (!myIsRecordOnly) { myCurrentAncestorIndex = -1; editor = driveMergeReportEditor(myTarget, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, mergeCallback, editor);
editor = driveMergeReportEditor(myTarget, realURL1, startRev, realURL2, endRev, myChildrenWithMergeInfo, isRollBack, depth, adminArea, mergeCallback, editor); } finally { if (!myIsRecordOnly) { myCurrentAncestorIndex = -1; editor = driveMergeReportEditor(myTarget, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, mergeCallback, editor);
editor = driveMergeReportEditor(myTarget, realURL1, startRev, realURL2, endRev, myChildrenWithMergeInfo, isRollBack, depth, adminArea, mergeCallback, editor); } finally { if (!myIsRecordOnly) { myCurrentAncestorIndex = -1; editor = driveMergeReportEditor(myTarget, url1, revision1, url2, revision2, null, isRollBack, depth, adminArea, mergeCallback, editor);