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

Enhancement: Expose Merge Whitespace Options in JavaHL

From: Jamie Jackson <jamiejaxon_at_gmail.com>
Date: Fri, 22 Apr 2016 11:52:56 -0400

Hi Folks,

I'd like to file an enhancement request:

JavaHL doesn't seem to expose some necessary merge options. From the CLI:

  -x [--extensions] ARG : Specify differencing options for external diff
                             internal diff or blame. Default: '-u'. Options
                             separated by spaces. Internal diff and blame
                               -u, --unified: Show 3 lines of unified
                               -b, --ignore-space-change: Ignore changes in
                                 amount of white space
                               -w, --ignore-all-space: Ignore all white
                               --ignore-eol-style: Ignore changes in EOL
                               -U ARG, --context ARG: Show ARG lines of
                               -p, --show-c-function: Show C function name

The differ seems to have the options:


...but as far as I know, merge does not.

The option I'm particularly interested in is --ignore-space-change.
TortoiseSVN, for instance, makes easy work of merges that involve lots of,
say, indentation changes; whereas in Java clients, there can be *loads* more
confusing/manual conflict editing, due to the reduced merge support in

For what it's worth, here's a thread I started on the Subclipse mailing
list, before I was referred upstream to the Subversion project.

Received on 2016-04-22 21:43:21 CEST

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

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