[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: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'?

> What is the best way to produce a command line option for the enum
> below?
>
> typedef enum svn_diff_conflict_display_style_t
> {
> /** Display modified and latest, with conflict markers. */
> svn_diff_conflict_display_modified_latest,
..
> } svn_diff_conflict_display_style_t;
>

An implementation of this was committed in r1591750.

> --
> Philip

Thanks for picking this thread up.

Daniel
Received on 2014-05-02 00:52:44 CEST

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