Enhancement: Expose Merge Whitespace Options in JavaHL

[Jamie Jackson <ja...@gmail.com>]

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​pache.org/docs/javah​l/latest/org/apache/​subversion/javahl/SV​NUtil.DiffOptions.Ig​noreSpace.html#chang​e
<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

Re: Enhancement: Expose Merge Whitespace Options in JavaHL

[Mark Phippard <ma...@gmail.com>]

On Fri, Apr 22, 2016 at 4:18 PM, <jb...@icloud.com> wrote:

>
> > On Apr 22, 2016, at 8:52 AM, Jamie Jackson <ja...@gmail.com> wrote:
> >
> > JavaHL doesn't seem to expose some necessary merge options. From the CLI:
> >
> ...
> >
> > Thanks,
> > Jamie
>
> Have you tried SvnKit? I had much better luck using that than
> subclipse+javahl.
>
>
>
That would not matter.  Subclipse is written to the JavaHL interface.  So
SVNKit cannot implement anything for that interface that it does not
expose.  Meaning maybe SVNKit offers a lower level merge API that exposes
these options, but Subclipse does not use that API, it uses the JavaHL
interface.



-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

Re: Enhancement: Expose Merge Whitespace Options in JavaHL

[jb...@icloud.com]

> On Apr 22, 2016, at 8:52 AM, Jamie Jackson <ja...@gmail.com> wrote:
> 
> JavaHL doesn't seem to expose some necessary merge options. From the CLI:
> 
...
> 
> Thanks,
> Jamie

Have you tried SvnKit? I had much better luck using that than subclipse+javahl.