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

Re: [Subclipse-users] Ignore Whitespace During *Merge*

From: Jamie Jackson <jamiejaxon_at_gmail.com>
Date: Wed, 22 Jun 2016 11:57:12 -0400

Subclipse ticket: http://subclipse.tigris.org/issues/show_bug.cgi?id=1655
Subversion (JavaHL) upstream ticket:
https://issues.apache.org/jira/browse/SVN-4638

On Fri, Apr 22, 2016 at 12:03 PM, Jamie Jackson <jamiejaxon_at_gmail.com>
wrote:

> Okay, thanks for the information, Mark. I sent an enhancement request to
> the Subversion users list (post pending, since I hadn't been subscribed).
>
> On Fri, Apr 22, 2016 at 11:17 AM, Mark Phippard <markphip_at_gmail.com>
> wrote:
>
>> The main thing would be to look at ISVNClient as that exposes the methods
>> we use:
>>
>>
>> http://subversion.apache.org/docs/javahl/1.9/org/apache/subversion/javahl/ISVNClient.html
>>
>> So in this case, you want Merge to ignore whitespace. When you look at
>> the merge methods exposed, none of those seem to support passing flags that
>> tell merge to ignoreWhitespace.
>>
>> The diff method has been enhanced (seemingly in the 1.8 release) to
>> accept this new DiffOptions class with these flags, but I do not see that
>> merge has the same. That is what we would need to be able to expose UI
>> options for the same.
>>
>> Mark
>>
>>
>>
>> On Fri, Apr 22, 2016 at 10:56 AM, Jamie Jackson <jamiejaxon_at_gmail.com>
>> wrote:
>>
>>> I can't claim to know squat about JavaHL, but is this the option?
>>> https://subversion.apache.org/docs/javahl/latest/org/apache/subversion/javahl/SVNUtil.DiffOptions.IgnoreSpace.html#change
>>>
>>> If there's an upstream enhancement to be filed (to the Subversion/JavaHL
>>> team), I don't mind doing it, but I'll need to be able to write an
>>> intelligible ticket.
>>>
>>> Thanks,
>>> Jamie
>>>
>>> On Thu, Apr 21, 2016 at 3:03 PM, Mark Phippard <markphip_at_gmail.com>
>>> wrote:
>>>
>>>> Those options are not available. I think things might have changed in
>>>> recent SVN releases, but the last time we touched this code the JavaHL API
>>>> did not expose any of these options to us in the API so we were not able to
>>>> expose them in our UI. As a C++ client, TortoiseSVN has access to the full
>>>> Subversion API.
>>>>
>>>> Mark
>>>>
>>>> On Thu, Apr 21, 2016 at 2:36 PM, Jamie Jackson <jamiejaxon_at_gmail.com>
>>>> wrote:
>>>>
>>>>> This topic came up before (
>>>>> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=907463
>>>>> ), but I'm not sure it was really resolved.
>>>>>
>>>>> In TortoiseSVN, there are a few whitespace-related options in the
>>>>> merge dialogs:
>>>>>
>>>>> - Ignore line endings
>>>>> - Compare whitespace
>>>>> - Ignore whitespace changes
>>>>> - Ignore all whitespaces
>>>>>
>>>>> (The last three are radios, BTW--mutually exclusive.)
>>>>>
>>>>> I routinely use the "ignore whitespace changes," and that affects
>>>>> behavior at *merge* time. In other words, that tends to create fewer
>>>>> conflicts when there are wholesale indentation changes going on.
>>>>>
>>>>> The option "Ignore whitespace" in Eclipse don't seem to behave the
>>>>> same way; rather, it seems to affect what is *displayed* in the
>>>>> conflict resolution diff, rather than affecting the behavior of the
>>>>> automated merge, itself.
>>>>>
>>>>> After all these years, I still need TortoiseSVN in my toolbox because
>>>>> of this feature; however, I'd love to drop it.
>>>>>
>>>>> Please let me know if I've missed some option to emulate the *merge* (not
>>>>> the diff viewing) behavior in Subclipse. Otherwise, please treat this as an
>>>>> enhancement request.
>>>>>
>>>>> Thanks,
>>>>> Jamie
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Thanks
>>>>
>>>> Mark Phippard
>>>> http://markphip.blogspot.com/
>>>>
>>>
>>>
>>
>>
>> --
>> Thanks
>>
>> Mark Phippard
>> http://markphip.blogspot.com/
>>
>
>

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3176343

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2016-06-22 17:57:25 CEST

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