File getPrejfileAbspath(File localAbspath) throws SVNException { List<SVNConflictDescription> conflicts = db.readConflicts(localAbspath); for (SVNConflictDescription cd : conflicts) { if (cd.isPropertyConflict()) { if (cd.getMergeFiles().getRepositoryPath().equals(THIS_DIR_PREJ + PROP_REJ_EXT)) { return SVNFileUtil.createFilePath(localAbspath, THIS_DIR_PREJ + PROP_REJ_EXT); } return SVNFileUtil.createFilePath(cd.getMergeFiles().getRepositoryPath()); } } return null; }
protected SVNMergeResult handleChooseRepository(SVNMergeFileSet files) throws SVNException { SVNLog log = files.getLog(); if (log != null) { SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, files.getRepositoryPath()); 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 handleChooseRepository(SVNMergeFileSet files) throws SVNException { SVNLog log = files.getLog(); if (log != null) { SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, files.getRepositoryPath()); 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 handleChooseRepository(SVNMergeFileSet files) throws SVNException { SVNProperties command = new SVNProperties(); SVNLog log = files.getLog(); command.put(SVNLog.NAME_ATTR, files.getRepositoryPath()); command.put(SVNLog.DEST_ATTR, files.getWCPath()); log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false); command.clear(); return SVNMergeResult.createMergeResult(SVNStatusType.MERGED, null); }
files.getResultFile() != null) { try { SVNCommandUtil.mergeFileExternally(mySVNEnvironment, files.getBasePath(), files.getRepositoryPath(), files.getLocalPath(), files.getResultPath(), files.getWCPath(), null); performedEdit = true;
files.getResultFile() != null) { try { SVNCommandUtil.mergeFileExternally(mySVNEnvironment, files.getBasePath(), files.getRepositoryPath(), files.getLocalPath(), files.getResultPath(), files.getWCPath(), null); performedEdit = true;
try { basePath = mergeFiles.getBasePath(); repositoryPath = mergeFiles.getRepositoryPath(); } catch (SVNException e) {
try { basePath = mergeFiles.getBasePath(); repositoryPath = mergeFiles.getRepositoryPath(); } catch (SVNException e) {
try { basePath = mergeFiles.getBasePath(); repositoryPath = mergeFiles.getRepositoryPath(); } catch (SVNException e) {
try { basePath = mergeFiles.getBasePath(); repositoryPath = mergeFiles.getRepositoryPath(); } catch (SVNException e) {
String latestPath = files.getRepositoryPath(); File tmpTargetCopy = SVNTranslator.getTranslatedFile(files.getAdminArea(), files.getWCPath(), files.getWCFile(), false, false, false, true);
command.clear(); String latestPath = files.getRepositoryPath(); command.put(SVNLog.NAME_ATTR, latestPath); command.put(SVNLog.DEST_ATTR, newPath);
String latestPath = files.getRepositoryPath(); File tmpTargetCopy = SVNTranslator.getTranslatedFile(files.getAdminArea(), files.getWCPath(), files.getWCFile(), false, false, false, true);