[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: Philip Martin <philip_at_codematters.co.uk>
Date: Thu, 01 May 2014 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.

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,

  /** Like svn_diff_conflict_display_modified_latest, but with an
      extra effort to identify common sequences between modified and
      latest. */
  svn_diff_conflict_display_resolved_modified_latest,

  /** Display modified, original, and latest, with conflict
      markers. */
  svn_diff_conflict_display_modified_original_latest,

  /** Just display modified, with no markers. */
  svn_diff_conflict_display_modified,

  /** Just display latest, with no markers. */
  svn_diff_conflict_display_latest,

  /** Like svn_diff_conflict_display_modified_original_latest, but
      *only* showing conflicts. */
  svn_diff_conflict_display_only_conflicts
} svn_diff_conflict_display_style_t;

-- 
Philip
Received on 2014-05-01 20:04:37 CEST

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