Enhancement: Expose Merge Whitespace Options in JavaHL

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
or
                             internal diff or blame. Default: '-u'. Options
are
                             separated by spaces. Internal diff and blame
take:
                               -u, --unified: Show 3 lines of unified
context
                               -b, --ignore-space-change: Ignore changes in
                                 amount of white space
                               -w, --ignore-all-space: Ignore all white
space
                               --ignore-eol-style: Ignore changes in EOL
style
                               -U ARG, --context ARG: Show ARG lines of
context
                               -p, --show-c-function: Show C function name

The differ seems to have the options:

https://subversion.a%e2%80%8bpache.org/docs/javah%e2%80%8bl/latest/org/apache/%e2%80%8bsubversion/javahl/SV%e2%80%8bNUtil.DiffOptions.Ig%e2%80%8bnoreSpace.html#chang%e2%80%8be
<https://subversion.apache.org/docs/javahl/latest/org/apache/subversion/javahl/SVNUtil.DiffOptions.IgnoreSpace.html#change>

...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
JavaHL.

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.

Thanks,
Jamie
Received on 2016-04-22 21:43:21 CEST