On 2011-01-10 14:52-0800 David MacMahon wrote: > Hi, Alan,
> I happened to notice (using gitk to view my local "git svn" clone of the plplot repo) the difference that this svn command shows... > > svn diff -x -u \ > https://plplot.svn.sourceforge.net/svnroot/plplot/tr...@11241 \ > https://plplot.svn.sourceforge.net/svnroot/plplot/tags/v5_...@11242 Using that same command I confirm those Id versus Id: differences. > It's not about the properties list so much as it is about some colons that svn thinks were deleted. You'll notice that examples/tcl/x24 was not in my patch but does show up in the output of the above svn diff command. Subversion seems to have removed the colon from that file in r11447 (svn diff -c11447). I confirm those Id difference as well with that svn diff command, e.g., -# $Id:$ +# $Id$ That implies that colon was removed. And yet we have softw...@raven> grep Id examples/tcl/x24 # $Id: x24 11447 2011-01-07 07:46:45Z arjenmarkus $ i.e., the colon is still there. Also, I have used svn cat --revision 8676 examples/tcl/x24 >../x24_test then compared the Id line for that previous revision of the file with the trunk version of examples/tcl/x24 using the "od -a" command. The colons were there for both and there were no special characters. IOW, the above svn diff result is not consistent with what happens if you examine the various revisions of the file in detail. > Weird. Absolutely. Note that Arjen is using a Windows svn client so there may be some Windows/Unix difference that is confusing the svn diff command. Note that command tries to suppress Id diffs for obvious reasons. I suspect you may have found an arcane svn diff bug that does not properly suppress Id differences on Unix if a windows client is used to check in the file earlier. In any case, since the checked-out files are unaffected, I suggest we ignore this. > > While we're on the topic of keywords, other files that might need to have > svn:keywords added (or "Id" added to svn:keywords)... > > examples/ada/x06a.adb > examples/ada/x07a.adb > examples/ada/xthick06a.adb > examples/ada/xthick07a.adb > examples/python/xw20.py: > examples/python/xw21.py: > examples/python/xw25.py: > > These files might have problems (examples/tcl/x25 for sure, $Id:" doesn't > seen to get expanded)... > > examples/d/x04d.d > examples/d/x05d.d > examples/d/x16d.d > examples/d/x20d.d > examples/d/x21d.d > examples/d/x22d.d > examples/d/x26d.d > examples/d/x28d.d > examples/d/x31d.d > examples/tcl/x25 Thanks for finding these issues. Apparently, we have been rather sloppy about declaring consistent properties when creating files (those PLplot developers on Unix should configure their svn client to do this automatically), and we have also been sloppy about the form of the $Id string (which always needs a trailing $) in a number of our source files. As of revision 11472 I believe I have fixed all these issues, but please do whatever you did before to double-check me. I note when I changed properties I also got -# $Id:$ +# $Id$ differences as a signal for that property change. But that doesn't explain the 5.9.7 release differences above (since those should involve no property changes) Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
