File mineFile = SVNFileUtil.createUniqueFile(root, files.getWCPath(), files.getLocalLabel(), false);
String minePath = SVNFileUtil.getBasePath(mineFile);
if (log != null) {
command.put(SVNLog.NAME_ATTR, files.getLocalPath());
command.put(SVNLog.DEST_ATTR, minePath);
log.addCommand(SVNLog.MOVE, command, false);
command.clear();
}
command.put(SVNProperty.shortPropertyName(SVNProperty.CONFLICT_WRK), minePath);
} else {
command.put(SVNProperty.shortPropertyName(SVNProperty.CONFLICT_WRK), "");