Re: Ignore Whitespace During *Merge*

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

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/

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

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

<div dir=3D"ltr">Those options are not available.=C2=A0 I think things migh=
t have changed in recent SVN releases, but the last time we touched this co=
de the JavaHL API did not expose any of these options to us in the API so w=
e were not able to expose them in our UI.=C2=A0 As a C++ client, TortoiseSV=
N has access to the full Subversion API.<div><br></div><div>Mark</div></div=
><div class=3D"gmail_extra"><br><div class=3D"gmail_quote">On Thu, Apr 21, =
2016 at 2:36 PM, Jamie Jackson <span dir=3D"ltr">&lt;<a href=3D"mailto:jami=
[email protected]" target=3D"_blank">[email protected]</a>&gt;</span> wro=
te:<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.tigris.org/ds/viewMessage.do?dsFor=
umId=3D1047&amp;dsMessageId=3D907463" target=3D"_blank">http://subclipse.ti=
gris.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 T=
ortoiseSVN, there are a few whitespace-related 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 exclusive.)</div></div><div><br><=
/div><div>I routinely use the &quot;ignore whitespace changes,&quot; and th=
at affects behavior at <i>merge</i>=C2=A0time. In other words, that tends t=
o create fewer conflicts when there are wholesale indentation changes going=
 on.</div><div><br></div><div>The option &quot;Ignore whitespace&quot; in E=
clipse don&#39;t seem to behave the same way; rather, it seems to affect wh=
at is <i>displayed</i>=C2=A0in the conflict resolution diff, rather than af=
fecting the behavior of the automated merge, itself.</div><div><br></div><d=
iv>After all these years, I still need TortoiseSVN in my toolbox because of=
 this feature; however, I&#39;d love to drop it.</div><div><br></div><div>P=
lease let me know if I&#39;ve missed some option to emulate the <i>merge</i=
>=C2=A0(not the diff viewing) behavior in Subclipse. Otherwise, please trea=
t this as an enhancement request.</div><div><br></div><div>Thanks,</div><di=
v>Jamie</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"http://markp=
hip.blogspot.com/" target=3D"_blank">http://markphip.blogspot.com/</a></div=
>
</div>

------=_Part_6677_242166346.1461265408125--