public void mergeReintegrate(String path, Revision pegRevision, String localPath, boolean dryRun) throws ClientException { SVNDiffClient diffClient = getSVNDiffClient(); File dstPath = new File(localPath); try { if (isURL(path)){ SVNURL url = SVNURL.parseURIEncoded(path); diffClient.doMergeReIntegrate(url, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } else { File file = new File(path); diffClient.doMergeReIntegrate(file, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
public void mergeReintegrate(String path, Revision pegRevision, String localPath, boolean dryRun) throws ClientException { SVNDiffClient diffClient = getSVNDiffClient(); File dstPath = new File(localPath); try { if (isURL(path)){ SVNURL url = SVNURL.parseURIEncoded(path); diffClient.doMergeReIntegrate(url, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } else { File file = new File(path); diffClient.doMergeReIntegrate(file, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
public void mergeReintegrate(String path, Revision pegRevision, String localPath, boolean dryRun) throws ClientException { SVNDiffClient diffClient = getSVNDiffClient(); File dstPath = new File(localPath); try { if (isURL(path)){ SVNURL url = SVNURL.parseURIEncoded(path); diffClient.doMergeReIntegrate(url, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } else { File file = new File(path); diffClient.doMergeReIntegrate(file, JavaHLObjectFactory.getSVNRevision(pegRevision), dstPath, dryRun); } } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
client.doMergeReIntegrate(source1.getURL(), pegRevision1, target.getFile(), getSVNEnvironment().isDryRun()); } else { client.doMergeReIntegrate(source1.getFile(), pegRevision1, target.getFile(), getSVNEnvironment().isDryRun());
client.doMergeReIntegrate(source1.getURL(), pegRevision1, target.getFile(), getSVNEnvironment().isDryRun()); } else { client.doMergeReIntegrate(source1.getFile(), pegRevision1, target.getFile(), getSVNEnvironment().isDryRun());