[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Three-way merge markers by default

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 1 May 2014 22:58:24 +0000

Daniel Shahaf wrote on Thu, May 01, 2014 at 22:52:06 +0000:
> Philip Martin wrote on Thu, May 01, 2014 at 19:04:04 +0100:
> > Philip Martin <philip.martin_at_wandisco.com> writes:
> >
> > > svn_diff_conflict_display_modified_latest is similar to the output of
> > > GNU diff3 which is probably why it was chosen. Changing it might cause
> > > problems for tools that parse the output, but one option for anyone
> > > affected would be to use GNU diff3 with --diff3-cmd.
> >
> > We have our own standalone diff3 in tools/diff/diff3. It currently
> > hard-codes the same 2-way output that is hard-coded in libsvn_wc but we
> > could make it a command line option. Users who want precise control
> > over the ouput could configure it as an external diff3 command, although
> > we might want to rename it svndiff3.
> >
> "svndiff3" specifically might not be a good name because of the
> potential for confusion with svndiff0 and svndiff1 (the libsvn_delta
> binary delta formats). "svn-diff3" looks like a subcommand "diff3" of
> "svn" (following a pattern used by git, hg, pkgng, etc). Perhaps
> 'svn_diff3'?

'make install-tools' puts tools/diff/diff3 in $(prefix)/bin/svn-tools/diff3,
along with all other tools. Why would we need to rename it, then?

Actually, at least on unix, we could implicitly provide "prefix" as a
replaceable in the config file, so that people could write:

    % cat ~/.subversion/config
    diff3-cmd = %(prefix)s/svn-tools/diff3

and it would work regardless of where the 'svn' binary happened to be
installed. (For example, this could be useful if the homedir is shared
between multiple boxes that don't all have svn installed into the same

Received on 2014-05-02 00:59:00 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.