<div dir="ltr">Hello Regina,<div><br></div><div>I thought about what you said, and decided to do some validation.</div><div>I am now confident that you are correct-- that it's an "svn sync to git" issue.</div><div><br></div><div>Your commit for Tiger Encoding 2016 in svn definitely is CRLF in subversion, but LF on the git side only.<br></div><div>So, it looks like something gets lost on the sync.</div><div><div><br></div><div>I had a thought, and looked back in the history-- this issue seems to have happened once before.</div><div>The last Tiger Encoder updates (from 2015) were committed about last year, under svn commit 13906.</div><div>Afterward, strk made the follow-up svn commit 13909 that had comment "Commit the file with crlf as requested by .gitattribute (I think)".<br></div><div><br></div><div>When I inspect both of these commits, it's confusing-- I see that they both are using CRLF on the subversion side.</div><div>So, it looks like strk did some magic that I cannot understand.  I'm thinking that we'll need that magic once more.</div><div><br></div><div>Regards,</div><div>  -John</div><div><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 25, 2016 at 3:33 PM, Regina Obe <span dir="ltr"><<a href="mailto:lr@pcorp.us" target="_blank">lr@pcorp.us</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div lang="EN-US" link="blue" vlink="purple"><div><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">I'm thinking it's still the git mirroring that converted  CRLF to LF.  So might be something strk needs to look into since he's in charge of the mirroring to github.<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Looking at the file locally that I committed to SVN, it has CRLFs and we have a similar svn property to force CRLF for bat files for svn.<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">The only thing I can think of why this is suddenly an issue is I think this might be the first commit I have made to these files since we added the git attributes for bat files.<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">So perhaps before it took the file literally and now (it does something weird like store it with LF for push it down with CRLF)<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Any non-windows person seeing the same issue?<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">I thought internally that Git always stores files with some linebreak specific to server and it's when the user pulls it down, that it may change line breaks for select files based on rules, so should be ignoring these for cloning.  Like I always get files down with CRLF (even .sh files, .sql, and config files unless specific gitattribute rules are in place) which drove me nuts cause then they'd cause all sorts of compile errors and false regression errors when running under a Unix shell in windows.<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Thanks,<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Regina<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><p class="MsoNormal" style="margin-left:.5in"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> postgis-devel [mailto:<a href="mailto:postgis-devel-bounces@lists.osgeo.org" target="_blank">postgis-devel-bounces@<wbr>lists.osgeo.org</a>] <b>On Behalf Of </b>John Harvey<br><b>Sent:</b> Thursday, August 25, 2016 1:32 PM<span class=""><br><b>To:</b> PostGIS Development Discussion <<a href="mailto:postgis-devel@lists.osgeo.org" target="_blank">postgis-devel@lists.osgeo.org</a><wbr>><br></span><b>Subject:</b> Re: [postgis-devel] Current master branch of postgis causing clone issues ?<u></u><u></u></span></p><div><div class="h5"><p class="MsoNormal" style="margin-left:.5in"><u></u> <u></u></p><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Hi Regina,</span><u></u><u></u></p><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Thanks for your reply.<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Ok, I think I know the issue and can explain it.<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">I *believe* that the 2 batch files were actually committed with LF-only.<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Here's how I'll try to prove it:<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">First, let's grab the raw file from *before* the Tiger 2016 commit:<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">git show 2a35bea:extras/tiger_geocoder/<wbr>create_geocode.bat > ~/before_create_geocode.bat<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">That command may look weird, but I'm doing it this way to prevent any gitattribute changes or git config changes.<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Second, let's grab the raw file *from* the Tiger 2016 commit<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">git show 598fea:extras/tiger_geocoder/<wbr>create_geocode.bat > ~/after_create_geocode.bat<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">When I open ~/before_create_geocode.<wbr>bat in a hex editor, I see that each line ends in "$0D0A", i.e. CRLF <u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">However, when I open ~/after_create_geocode.bat, I see that each line now only ends in "$0A", i.e LF.  So, the CR was dropped in the last commit.  That's why in my environment (a mac, using git), the .gitattributes file starts "fixing" things to be "$0D0A".<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">I've also verified that my pull-request I've sent in does contain the right raw $0D0A endlines.<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">I know that it's an SVN project, so that may not be helpful-- I can try to produce a patch-file if possible (or whatever you need).<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt"><u></u> <u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">Regards,<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.5pt">  -John<u></u><u></u></span></p></div><div><p class="MsoNormal" style="margin-left:.5in"><u></u> <u></u></p><div><p class="MsoNormal" style="margin-left:.5in">On Thu, Aug 25, 2016 at 11:00 AM, Regina Obe <<a href="mailto:lr@pcorp.us" target="_blank">lr@pcorp.us</a>> wrote:<u></u><u></u></p><blockquote style="border:none;border-left:solid #cccccc 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in"><div><div><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">John,</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">The .gitattributes ignore has been there for some time I think.  So that isn't new.</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">I did make commit to those two last batch files on 8/17.  Looking at the carriage return type they look like crlf to me.  </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Then again I'm on windows so things usually come down that way anyway unless explicitly set in gitattributes.</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">When I do a git clone and git status I get:</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:"Lucida Console"">On branch svn-trunk</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:"Lucida Console"">Your branch is up-to-date with 'origin/svn-trunk'.</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:"Lucida Console"">nothing to commit, working directory clean</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Perhaps someone not on windows can check and see if they are seeing the same thing.</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">It might be something introduced by the mirroring, because github is not our official repo.  We still use SVN so when I commit I commit on the svn repo and it gets mirrored to github.</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Thanks,</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">Regina</span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:.5in"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span><u></u><u></u></p><p class="MsoNormal" style="margin-left:1.0in"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> postgis-devel [mailto:<a href="mailto:postgis-devel-bounces@lists.osgeo.org" target="_blank">postgis-devel-bounces@<wbr>lists.osgeo.org</a>] <b>On Behalf Of </b>John Harvey<br><b>Sent:</b> Thursday, August 25, 2016 10:19 AM<br><b>To:</b> PostGIS Development Discussion <<a href="mailto:postgis-devel@lists.osgeo.org" target="_blank">postgis-devel@lists.osgeo.org</a><wbr>><br><b>Subject:</b> [postgis-devel] Current master branch of postgis causing clone issues ?</span><u></u><u></u></p><div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p><div><p class="MsoNormal" style="margin-left:1.0in">Hello all,<u></u><u></u></p><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">I see something weird in PostGIS at the moment.<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">When I do:<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">mkdir ~/git<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">cd ~/git<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">git clone <a href="mailto:git@github.com:postgis/postgis.git" target="_blank">git@github.com:postgis/<wbr>postgis.git</a><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">cd postgis<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">git status<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">I notice the following:<u></u><u></u></p></div><div><div><p class="MsoNormal" style="margin-left:1.0in">            modified:   extras/tiger_geocoder/create_<wbr>geocode.bat<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">            modified:   extras/tiger_geocoder/upgrade_<wbr>geocoder.bat<u></u><u></u></p></div></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">Although, I didn't modify these files.  I just did a regular clone.  <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">I suspect the .gitattributes file has something to do with it.<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">The 2 files impacted are Windows files, so probably have the wrong carriage-return type.<u></u><u></u></p></div><div><div><p class="MsoNormal" style="margin-left:1.0in">And, in the .gitattributes file, I see this rule:<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">*.bat       eol=crlf<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">So, I think this forces a change after clone.<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">I suspect this problem was introduced in the latest commit from 8/17 (it seems the endline changes were committed there).<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">Does anyone else see this problem?  Is this something that can be fixed?<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in"> <u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">Thanks!<u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:1.0in">  -John Harvey<u></u><u></u></p></div></div></div></div></div></div></div><p class="MsoNormal" style="margin-left:.5in"><br>______________________________<wbr>_________________<br>postgis-devel mailing list<br><a href="mailto:postgis-devel@lists.osgeo.org" target="_blank">postgis-devel@lists.osgeo.org</a><br><a href="http://lists.osgeo.org/mailman/listinfo/postgis-devel" target="_blank">http://lists.osgeo.org/<wbr>mailman/listinfo/postgis-devel</a><u></u><u></u></p></blockquote></div><p class="MsoNormal" style="margin-left:.5in"><u></u> <u></u></p></div></div></div></div></div></div><br>______________________________<wbr>_________________<br>
postgis-devel mailing list<br>
<a href="mailto:postgis-devel@lists.osgeo.org">postgis-devel@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/postgis-devel" rel="noreferrer" target="_blank">http://lists.osgeo.org/<wbr>mailman/listinfo/postgis-devel</a><br></blockquote></div><br></div>