subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <>
Subject Re: Tree conflict resolution considered harmful
Date Fri, 31 Aug 2018 09:44:34 GMT
On Fri, Aug 31, 2018 at 11:06:07AM +0200, Dag-Erling Smørgrav wrote:
> Daniel Shahaf <> writes:
> > You probably know the following, but for the list's benefit I'll say it:
> > awk(1) is not a robust way to parse `svn status` output; the output is
> > columns-oriented, not whitespace-separated-fields oriented.  `svn st |
> > cut` or `svn st --xml` are the recommended idioms.
> Now that you mention it, /^...C/ would have been much simpler.

Note also the 'svnconflict' tool which allows you to drive the
conflict resolver from scripts.

usage: svnconflict <subcommand> [args]
Type 'svnconflict --version' to see the program version and RA modules,

svnconflict provides a non-interactive conflict resolution interface.
It is intended for use by non-interactive scripts which cannot make
use of interactive conflict resolution provided by 'svn resolve'.

svnconflict operates on a single working copy path only. It is assumed that
scripts are able to discover conflicted paths in the working copy via other
means, such as 'svn status'.
Some advanced operations offered by 'svn resolve' are not supported.

svnconflict may contact the repository to obtain information about a conflict.
It will never modify the repository, but only read information from it.
svnconflict will not prompt for credentials. If read-access to the repository
requires credentials but no suitable credentials are stored in Subversion's
authentication cache or provided on the command line, the operation may fail.

Available subcommands:
   help (?, h)
   list (ls)

Subversion is a tool for version control.
For additional information, see

View raw message