protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (mergeResult.getMergeStatus() != SVNStatusType.CONFLICTED) { // do normal merge. if (mergeResult.getMergeStatus() != SVNStatusType.UNCHANGED) { command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); } return mergeResult; } else if (files.isBinary()) { // this action is not applicable for binary conflited files. return handleMarkConflicted(files); } else { // for text file we could use merged version in case of conflict. command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); return SVNMergeResult.createMergeResult(SVNStatusType.MERGED, null); } }
protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (mergeResult.getMergeStatus() != SVNStatusType.CONFLICTED) { // do normal merge. if (mergeResult.getMergeStatus() != SVNStatusType.UNCHANGED) { if (log != null) { command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); } } return mergeResult; } else if (files.isBinary()) { // this action is not applicable for binary conflited files. return handleMarkConflicted(files); } else { if (log != null) { // for text file we could use merged version in case of conflict. command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); } return SVNMergeResult.createMergeResult(SVNStatusType.MERGED, null); } }
protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (mergeResult.getMergeStatus() != SVNStatusType.CONFLICTED) { // do normal merge. if (mergeResult.getMergeStatus() != SVNStatusType.UNCHANGED) { if (log != null) { command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); } } return mergeResult; } else if (files.isBinary()) { // this action is not applicable for binary conflited files. return handleMarkConflicted(files); } else { if (log != null) { // for text file we could use merged version in case of conflict. command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); } return SVNMergeResult.createMergeResult(SVNStatusType.MERGED, null); } }
protected void postMergeCleanup(SVNMergeFileSet files) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (!files.getLocalPath().equals(files.getWCPath())) { command.put(SVNLog.NAME_ATTR, files.getLocalPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); } command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_EXECUTABLE, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_READONLY, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getResultPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); }
try { SVNCommandUtil.mergeFileExternally(mySVNEnvironment, files.getBasePath(), files.getRepositoryPath(), files.getLocalPath(), files.getResultPath(), files.getWCPath(), null); performedEdit = true; } catch (SVNException svne) {
try { SVNCommandUtil.mergeFileExternally(mySVNEnvironment, files.getBasePath(), files.getRepositoryPath(), files.getLocalPath(), files.getResultPath(), files.getWCPath(), null); performedEdit = true; } catch (SVNException svne) {
protected void postMergeCleanup(SVNMergeFileSet files) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (!files.getLocalPath().equals(files.getWCPath())) { if (log != null) { command.put(SVNLog.NAME_ATTR, files.getLocalPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); } } if (log != null) { command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_EXECUTABLE, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_READONLY, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getResultPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); } }
protected void postMergeCleanup(SVNMergeFileSet files) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); if (!files.getLocalPath().equals(files.getWCPath())) { if (log != null) { command.put(SVNLog.NAME_ATTR, files.getLocalPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); } } if (log != null) { command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_EXECUTABLE, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getWCPath()); log.addCommand(SVNLog.MAYBE_READONLY, command, false); command.clear(); command.put(SVNLog.NAME_ATTR, files.getResultPath()); log.addCommand(SVNLog.DELETE, command, false); command.clear(); } }
repositoryPath, mergeFiles.getWCPath(), mergeFiles.getResultPath(), left, right
repositoryPath, mergeFiles.getWCPath(), mergeFiles.getResultPath(), left, right
repositoryPath, mergeFiles.getWCPath(), mergeFiles.getResultPath(), left, right
repositoryPath, mergeFiles.getWCPath(), mergeFiles.getResultPath(), left, right
command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); command.put(SVNLog.ATTR2, files.getWCPath());
command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); command.put(SVNLog.ATTR2, files.getWCPath());
command.put(SVNLog.NAME_ATTR, files.getResultPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); command.put(SVNLog.ATTR2, files.getWCPath());