Re: Ignore Whitespace During *Merge*
Jamie Jackson <[email protected]> Wed, 22 Jun 2016 11:57:12 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CA+onWPeXk80VO08sYeMhGPtmVvoTBnQb0WcqJXQHn7N84_-cDA@mail.gmail.com> |
------=_Part_6579_696387840.1466611037473 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 <[email protected]> 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 <[email protected]> > 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 <[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=3176343 To unsubscribe from this discussion, e-mail: [[email protected]]. ------=_Part_6579_696387840.1466611037473 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">Subclipse ticket:=C2=A0<a href=3D"http://subclipse.tigris.= org/issues/show_bug.cgi?id=3D1655">http://subclipse.tigris.org/issues/show_= bug.cgi?id=3D1655</a><div>Subversion (JavaHL) upstream ticket:=C2=A0<a href= =3D"https://issues.apache.org/jira/browse/SVN-4638">https://issues.apache.o= rg/jira/browse/SVN-4638</a></div></div><div class=3D"gmail_extra"><br><div = class=3D"gmail_quote">On Fri, Apr 22, 2016 at 12:03 PM, Jamie Jackson <span= dir=3D"ltr"><<a href=3D"mailto:[email protected]" target=3D"_blank">= [email protected]</a>></span> wrote:<br><blockquote class=3D"gmail_qu= ote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex= "><div dir=3D"ltr">Okay, thanks for the information, Mark. I sent an enhanc= ement request to the Subversion users list (post pending, since I hadn'= t been subscribed).</div><div class=3D"HOEnZb"><div class=3D"h5"><div class= =3D"gmail_extra"><br><div class=3D"gmail_quote">On Fri, Apr 22, 2016 at 11:= 17 AM, Mark Phippard <span dir=3D"ltr"><<a href=3D"mailto:markphip@gmail= .com" target=3D"_blank">[email protected]</a>></span> wrote:<br><blockq= uote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc = solid;padding-left:1ex"><div dir=3D"ltr">The main thing would be to look at= ISVNClient as that exposes the methods we use:<div><br></div><div><a href= =3D"http://subversion.apache.org/docs/javahl/1.9/org/apache/subversion/java= hl/ISVNClient.html" target=3D"_blank">http://subversion.apache.org/docs/jav= ahl/1.9/org/apache/subversion/javahl/ISVNClient.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, none of those seem to support passi= ng flags that tell merge to ignoreWhitespace.</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, but I do not see that merge has th= e same.=C2=A0 That is what we would need to be able to expose UI options fo= r the same.</div><span><font color=3D"#888888"><div><br></div><div>Mark</di= v><div><br></div><div><br></div></font></span></div><div><div><div class=3D= "gmail_extra"><br><div class=3D"gmail_quote">On Fri, Apr 22, 2016 at 10:56 = AM, Jamie Jackson <span dir=3D"ltr"><<a href=3D"mailto:jamiejaxon@gmail.= com" target=3D"_blank">[email protected]</a>></span> wrote:<br><block= quote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc= solid;padding-left:1ex"><div dir=3D"ltr">I can't claim to know squat a= bout JavaHL, but is this the option? <a href=3D"https://subversion.apache.o= rg/docs/javahl/latest/org/apache/subversion/javahl/SVNUtil.DiffOptions.Igno= reSpace.html#change" target=3D"_blank">https://subversion.apache.org/docs/j= avahl/latest/org/apache/subversion/javahl/SVNUtil.DiffOptions.IgnoreSpace.h= tml#change</a><div><br></div><div>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.</div><div><br></di= v><div>Thanks,</div><div>Jamie</div></div><div><div><div class=3D"gmail_ext= ra"><br><div class=3D"gmail_quote">On Thu, Apr 21, 2016 at 3:03 PM, Mark Ph= ippard <span dir=3D"ltr"><<a href=3D"mailto:[email protected]" target= =3D"_blank">[email protected]</a>></span> wrote:<br><blockquote class= =3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padd= ing-left:1ex"><div dir=3D"ltr">Those options are not available.=C2=A0 I thi= nk things might have changed in recent SVN releases, but the last time we t= ouched this code the JavaHL API did not expose any of these options to us i= n the API so we were not able to expose them in our UI.=C2=A0 As a C++ clie= nt, TortoiseSVN has access to the full Subversion API.<div><br></div><div>M= ark</div></div><div class=3D"gmail_extra"><div><div><br><div class=3D"gmail= _quote">On Thu, Apr 21, 2016 at 2:36 PM, Jamie Jackson <span dir=3D"ltr">&l= t;<a href=3D"mailto:[email protected]" target=3D"_blank">jamiejaxon@gmai= l.com</a>></span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"m= argin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir=3D"l= tr"><div>This topic came up before ( <a href=3D"http://subclipse.tigris.org= /ds/viewMessage.do?dsForumId=3D1047&dsMessageId=3D907463" target=3D"_bl= ank">http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3D1047&dsM= essageId=3D907463</a> ), but I'm not sure it was really resolved.</div>= <div><br></div><div>In TortoiseSVN, there are a few whitespace-related opti= ons in the merge dialogs:</div><div><ul><li>Ignore line endings</li><li>Com= pare whitespace</li><li>Ignore whitespace changes<br></li><li>Ignore all wh= itespaces</li></ul><div>(The last three are radios, BTW--mutually exclusive= .)</div></div><div><br></div><div>I routinely use the "ignore whitespa= ce changes," and that affects behavior at <i>merge</i>=C2=A0time. In o= ther words, that tends to create fewer conflicts when there are wholesale i= ndentation changes going on.</div><div><br></div><div>The option "Igno= re whitespace" in Eclipse don't seem to behave the same way; rathe= r, it seems to affect what is <i>displayed</i>=C2=A0in the conflict resolut= ion diff, rather than affecting the behavior of the automated merge, itself= .</div><div><br></div><div>After all these years, I still need TortoiseSVN = in my toolbox because of this feature; however, I'd love to drop it.</d= iv><div><br></div><div>Please let me know if I've missed some option to= emulate the <i>merge</i>=C2=A0(not the diff viewing) behavior in Subclipse= . Otherwise, please treat this as an enhancement request.</div><div><br></d= iv><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>Thanks<br><br>Mark Phippard<br><a href=3D"http://markphip.blogspot.com= /" target=3D"_blank">http://markphip.blogspot.com/</a></div> </div> </div></div></blockquote></div><br></div> </div></div></blockquote></div><br></div> ------=_Part_6579_696387840.1466611037473--