doResolve(path, depth, true, true, conflictChoice);
doResolve(path, depth, resolveContents, resolveProperties, true, conflictChoice);
doResolve(path, depth, resolveContents, resolveProperties, true, conflictChoice);
doResolve(path, depth, true, true, conflictChoice);
/** * Resolves a 'conflicted' state on a Working Copy item. * * @param path a WC item to be resolved * @param recursive <span class="javakeyword">true</span> to * descend recursively (relevant for directories) - this * will resolve the entire tree * @throws SVNException if <code>path</code> is not under version control * @deprecated use {@link #doResolve(File, SVNDepth, SVNConflictChoice)} instead */ public void doResolve(File path, boolean recursive) throws SVNException { doResolve(path, SVNDepth.fromRecurse(recursive), SVNConflictChoice.MERGED); }
/** * Resolves a 'conflicted' state on a Working Copy item. * * @param path a WC item to be resolved * @param recursive <span class="javakeyword">true</span> to * descend recursively (relevant for directories) - this * will resolve the entire tree * @throws SVNException if <code>path</code> is not under version control * @deprecated use {@link #doResolve(File, SVNDepth, SVNConflictChoice)} instead */ public void doResolve(File path, boolean recursive) throws SVNException { doResolve(path, SVNDepth.fromRecurse(recursive), SVNConflictChoice.MERGED); }
/** * Resolves a 'conflicted' state on a Working Copy item. * * @param path * a WC item to be resolved * @param recursive * <span class="javakeyword">true</span> to descend recursively * (relevant for directories) - this will resolve the entire tree * @throws SVNException * if <code>path</code> is not under version control * @deprecated use {@link #doResolve(File, SVNDepth, SVNConflictChoice)} * instead */ public void doResolve(File path, boolean recursive) throws SVNException { doResolve(path, SVNDepth.fromRecurse(recursive), SVNConflictChoice.MINE_FULL); }
public void resolved(String path, boolean recurse) throws ClientException { SVNWCClient client = getSVNWCClient(); try { client.doResolve(new File(path).getAbsoluteFile(), recurse); } catch (SVNException e) { throwException(e); } }
public void resolve(String path, int depth, int conflictResult) throws ClientException { SVNWCClient client = getSVNWCClient(); try { client.doResolve(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNDepth(depth), JavaHLObjectFactory.getSVNConflictChoice(conflictResult)); } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
public void resolve(String path, int depth, int conflictResult) throws ClientException { SVNWCClient client = getSVNWCClient(); try { client.doResolve(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNDepth(depth), JavaHLObjectFactory.getSVNConflictChoice(conflictResult)); } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
public void resolve(String path, int depth, int conflictResult) throws ClientException { SVNWCClient client = getSVNWCClient(); try { client.doResolve(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNDepth(depth), JavaHLObjectFactory.getSVNConflictChoice(conflictResult)); } catch (SVNException e) { throwException(e); } finally { resetLog(); } }
wcClient.doResolve(localFile, // File file
wcClient.doResolve(localRoot, // File file
public void run() throws SVNException { List targets = getSVNEnvironment().combineTargets(getSVNEnvironment().getTargets(), true); if (targets.isEmpty()) { SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CL_INSUFFICIENT_ARGS), SVNLogType.CLIENT); } SVNWCClient client = getSVNEnvironment().getClientManager().getWCClient(); if (!getSVNEnvironment().isQuiet()) { client.setEventHandler(new SVNNotifyPrinter(getSVNEnvironment())); } SVNDepth depth = getSVNEnvironment().getDepth(); if (depth == SVNDepth.UNKNOWN) { depth = SVNDepth.EMPTY; } for (Iterator ts = targets.iterator(); ts.hasNext();) { String targetName = (String) ts.next(); SVNPath target = new SVNPath(targetName); if (target.isFile()) { try { client.doResolve(target.getFile(), depth, SVNConflictChoice.MERGED); } catch (SVNException e) { SVNErrorMessage err = e.getErrorMessage(); getSVNEnvironment().handleWarning(err, new SVNErrorCode[] {err.getErrorCode()}, getSVNEnvironment().isQuiet()); } } } }
public void run() throws SVNException { List targets = getSVNEnvironment().combineTargets(getSVNEnvironment().getTargets(), true); if (targets.isEmpty()) { SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CL_INSUFFICIENT_ARGS), SVNLogType.CLIENT); } SVNWCClient client = getSVNEnvironment().getClientManager().getWCClient(); if (!getSVNEnvironment().isQuiet()) { client.setEventHandler(new SVNNotifyPrinter(getSVNEnvironment())); } SVNDepth depth = getSVNEnvironment().getDepth(); if (depth == SVNDepth.UNKNOWN) { depth = SVNDepth.EMPTY; } for (Iterator ts = targets.iterator(); ts.hasNext();) { String targetName = (String) ts.next(); SVNPath target = new SVNPath(targetName); if (target.isFile()) { try { client.doResolve(target.getFile(), depth, SVNConflictChoice.MERGED); } catch (SVNException e) { SVNErrorMessage err = e.getErrorMessage(); getSVNEnvironment().handleWarning(err, new SVNErrorCode[] {err.getErrorCode()}, getSVNEnvironment().isQuiet()); } } } }
if (target.isFile()) { try { client.doResolve(target.getFile(), depth, choice); } catch (SVNException e) { SVNErrorMessage err = e.getErrorMessage();
if (target.isFile()) { try { client.doResolve(target.getFile(), depth, choice); } catch (SVNException e) { SVNErrorMessage err = e.getErrorMessage();