svnraisetreeconflict, version 1.9.3 (r1718519) compiled Mar 14 2016, 07:39:01 on x86_64-pc-linux-gnu Copyright (C) 2015 The Apache Software Foundation. This software consists of contributions made by many people; see the NOTICE file for more information. Subversion is open source software, see http://subversion.apache.org/

usage: svnraisetreeconflict [OPTIONS] WC_PATH NODE_KIND OPERATION ACTION REASON REPOS_URL1 PATH_IN_REPOS1 PEG_REV1 NODE_KIND1 REPOS_URL2 PATH_IN_REPOS2 PEG_REV2 NODE_KIND2 Mark the working-copy node WC_PATH as being the victim of a tree conflict. WC_PATH's parent directory must be a working copy, otherwise a tree conflict cannot be raised. Valid options: -h [--help] : display this help --version : show program version information Valid enum argument values: NODE_KIND, NODE_KIND1, NODE_KIND2: none file dir unknown OPERATION: update switch merge ACTION (what svn tried to do): edit delete add REASON (what local change made svn fail): edited deleted missing obstructed added REPOS_URL1, REPOS_URL2: The URL of the repository itself, e.g.: file://usr/repos PATH_IN_REPOS1, PATH_IN_REPOS2: The complete path of the node in the repository, e.g.: sub/dir/foo PEG_REV1, PEG_REV2: The revision number at which the given path is relevant. Example: svnraisetreeconflict ./foo file update delete deleted file://usr/repos sub/dir/foo 1 file file://usr/repos sub/dir/foo 3 none