Re: Ignore Whitespace During *Merge*

------=_Part_8519_1132972421.1461338279965
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

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 <[email protected]>
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 <[email protected]> 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 <[email protected]>
>> 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=3169874

To unsubscribe from this discussion, e-mail: [[email protected]].
------=_Part_8519_1132972421.1461338279965
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">The main thing would be to look at ISVNClient as that expo=
ses the methods we use:<div><br></div><div><a href=3D"http://subversion.apa=
che.org/docs/javahl/1.9/org/apache/subversion/javahl/ISVNClient.html">http:=
//subversion.apache.org/docs/javahl/1.9/org/apache/subversion/javahl/ISVNCl=
ient.html</a><br></div><div><br></div><div>So in this case, you want Merge =
to ignore whitespace.=C2=A0 When you look at the merge methods exposed, non=
e of those seem to support passing flags that tell merge to ignoreWhitespac=
e.</div><div><br></div><div>The diff method has been enhanced (seemingly in=
 the 1.8 release) to accept this new DiffOptions class with these flags, bu=
t I do not see that merge has the same.=C2=A0 That is what we would need to=
 be able to expose UI options for the same.</div><div><br></div><div>Mark</=
div><div><br></div><div><br></div></div><div class=3D"gmail_extra"><br><div=
 class=3D"gmail_quote">On Fri, Apr 22, 2016 at 10:56 AM, Jamie Jackson <spa=
n dir=3D"ltr">&lt;<a href=3D"mailto:[email protected]" target=3D"_blank"=
>[email protected]</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_q=
uote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1e=
x"><div dir=3D"ltr">I can&#39;t claim to know squat about JavaHL, but is th=
is the option? <a href=3D"https://subversion.apache.org/docs/javahl/latest/=
org/apache/subversion/javahl/SVNUtil.DiffOptions.IgnoreSpace.html#change" t=
arget=3D"_blank">https://subversion.apache.org/docs/javahl/latest/org/apach=
e/subversion/javahl/SVNUtil.DiffOptions.IgnoreSpace.html#change</a><div><br=
></div><div>If there&#39;s an upstream enhancement to be filed (to the Subv=
ersion/JavaHL team), I don&#39;t mind doing it, but I&#39;ll need to be abl=
e to write an intelligible ticket.</div><div><br></div><div>Thanks,</div><d=
iv>Jamie</div></div><div class=3D"HOEnZb"><div class=3D"h5"><div class=3D"g=
mail_extra"><br><div class=3D"gmail_quote">On Thu, Apr 21, 2016 at 3:03 PM,=
 Mark Phippard <span dir=3D"ltr">&lt;<a href=3D"mailto:[email protected]" =
target=3D"_blank">[email protected]</a>&gt;</span> wrote:<br><blockquote c=
lass=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;=
padding-left:1ex"><div dir=3D"ltr">Those options are not available.=C2=A0 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.=C2=A0 As a C++ =
client, TortoiseSVN has access to the full Subversion API.<div><br></div><d=
iv>Mark</div></div><div class=3D"gmail_extra"><div><div><br><div class=3D"g=
mail_quote">On Thu, Apr 21, 2016 at 2:36 PM, Jamie Jackson <span dir=3D"ltr=
">&lt;<a href=3D"mailto:[email protected]" target=3D"_blank">jamiejaxon@=
gmail.com</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" style=
=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir=
=3D"ltr"><div>This topic came up before ( <a href=3D"http://subclipse.tigri=
s.org/ds/viewMessage.do?dsForumId=3D1047&amp;dsMessageId=3D907463" target=
=3D"_blank">http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3D1047&=
amp;dsMessageId=3D907463</a> ), but I&#39;m not sure it was really resolved=
.</div><div><br></div><div>In TortoiseSVN, there are a few whitespace-relat=
ed options in the merge dialogs:</div><div><ul><li>Ignore line endings</li>=
<li>Compare whitespace</li><li>Ignore whitespace changes<br></li><li>Ignore=
 all whitespaces</li></ul><div>(The last three are radios, BTW--mutually ex=
clusive.)</div></div><div><br></div><div>I routinely use the &quot;ignore w=
hitespace changes,&quot; and that affects behavior at <i>merge</i>=C2=A0tim=
e. In other words, that tends to create fewer conflicts when there are whol=
esale indentation changes going on.</div><div><br></div><div>The option &qu=
ot;Ignore whitespace&quot; in Eclipse don&#39;t seem to behave the same way=
; rather, it seems to affect what is <i>displayed</i>=C2=A0in the conflict =
resolution diff, rather than affecting the behavior of the automated merge,=
 itself.</div><div><br></div><div>After all these years, I still need Torto=
iseSVN in my toolbox because of this feature; however, I&#39;d love to drop=
 it.</div><div><br></div><div>Please let me know if I&#39;ve missed some op=
tion to emulate the <i>merge</i>=C2=A0(not the diff viewing) behavior in Su=
bclipse. Otherwise, please treat this as an enhancement request.</div><div>=
<br></div><div>Thanks,</div><div>Jamie</div></div>
</blockquote></div><br><br clear=3D"all"><div><br></div></div></div><span><=
font color=3D"#888888">-- <br><div>Thanks<br><br>Mark Phippard<br><a href=
=3D"http://markphip.blogspot.com/" target=3D"_blank">http://markphip.blogsp=
ot.com/</a></div>
</font></span></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br><br clear=3D"all"><div><br></div>-- <br>=
<div class=3D"gmail_signature">Thanks<br><br>Mark Phippard<br><a href=3D"ht=
tp://markphip.blogspot.com/" target=3D"_blank">http://markphip.blogspot.com=
/</a></div>
</div>

------=_Part_8519_1132972421.1461338279965--