Ignore Whitespace During *Merge*

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

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

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

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

<div dir=3D"ltr"><div>This topic came up before ( <a href=3D"http://subclip=
se.tigris.org/ds/viewMessage.do?dsForumId=3D1047&amp;dsMessageId=3D907463">=
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3D1047&amp;dsMessag=
eId=3D907463</a> ), but I&#39;m not sure it was really resolved.</div><div>=
<br></div><div>In TortoiseSVN, there are a few whitespace-related options i=
n the merge dialogs:</div><div><ul><li>Ignore line endings</li><li>Compare =
whitespace</li><li>Ignore whitespace changes<br></li><li>Ignore all whitesp=
aces</li></ul><div>(The last three are radios, BTW--mutually exclusive.)</d=
iv></div><div><br></div><div>I routinely use the &quot;ignore whitespace ch=
anges,&quot; and that affects behavior at <i>merge</i>=C2=A0time. In other =
words, that tends to create fewer conflicts when there are wholesale indent=
ation changes going on.</div><div><br></div><div>The option &quot;Ignore wh=
itespace&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 d=
iff, rather than affecting the behavior of the automated merge, itself.</di=
v><div><br></div><div>After all these years, I still need TortoiseSVN in my=
 toolbox because of this feature; however, I&#39;d love to drop it.</div><d=
iv><br></div><div>Please let me know if I&#39;ve missed some option to emul=
ate the <i>merge</i>=C2=A0(not the diff viewing) behavior in Subclipse. Oth=
erwise, please treat this as an enhancement request.</div><div><br></div><d=
iv>Thanks,</div><div>Jamie</div></div>

------=_Part_6614_1655620594.1461263822645--