本文整理汇总了Java中org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions.setConflictHandler方法的典型用法代码示例。如果您正苦于以下问题：Java DefaultSVNOptions.setConflictHandler方法的具体用法？Java DefaultSVNOptions.setConflictHandler怎么用？Java DefaultSVNOptions.setConflictHandler使用的例子？那么, 这里精选的方法代码示例或许可以为您提供帮助。您也可以进一步了解该方法所在类org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions的用法示例。
在下文中一共展示了DefaultSVNOptions.setConflictHandler方法的2个代码示例，这些例子默认根据受欢迎程度排序。您可以为喜欢或者感觉有用的代码点赞，您的评价将有助于系统推荐出更棒的Java代码示例。
示例1: mergePath
import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; //导入方法依赖的package包/类
public List<String> mergePath(String url1, String workspace) throws SVNException {
SVNWCClient wCClient = SVNClientManager.newInstance().getWCClient();
SVNDiffClient diffClient = cliente.getDiffClient();
SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
//criando o DefaultOptions
DefaultSVNOptions svnOptions = (DefaultSVNOptions) diffClient.getOptions();
ConflictResolverHandler con = new ConflictResolverHandler();
svnOptions.setConflictHandler(con);
// diffClient.doMerge(SVNURL.parseURIEncoded(url1), SVNRevision.HEAD, Collections.singleton(range), new File(workspace), SVNDepth.INFINITY, true, false, false, false);
diffClient.doMerge(SVNURL.parseURIEncoded(url1), SVNRevision.UNDEFINED, Collections.singleton(range), new File(workspace), SVNDepth.INFINITY, true, false, false, false);
return con.getConflitos();
}
示例2: mergePathReintegrate
import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; //导入方法依赖的package包/类
public List<String> mergePathReintegrate(String url1, String workspace) throws SVNException {
SVNWCClient wCClient = SVNClientManager.newInstance().getWCClient();
SVNDiffClient diffClient = cliente.getDiffClient();
SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
//criando o DefaultOptions
DefaultSVNOptions svnOptions = (DefaultSVNOptions) diffClient.getOptions();
ConflictResolverHandler con = new ConflictResolverHandler();
svnOptions.setConflictHandler(con);
diffClient.doMergeReIntegrate(SVNURL.parseURIEncoded(url1),SVNRevision.HEAD, new File(workspace), false);
return con.getConflitos();
}