just noticed that CVS is merging changes into icons/minusnode.gif every time I do a cvs update. doesn't sound right. turns out that minusnode.gif and plusnode.gif has been checked in as text files (no -kb option). how can I fix this? (I should know, but I only use perforce these days, and my memory isn't what it used to be...) </F>
Fredrik Lundh writes:
You can adjust the -k* options using "cvs admin". I just did: cvs admin -kb plusnode.gif minusnode.gif to fix it for those two files; you might get one more update to correct what you have now, but things should work as expected after that. Thanks for pointing this out! -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Zope Corporation
[Fredrik Lundh]
You're not going to believe this, but I swear it's true: this happens on Windows boxes when daylight saving time starts or ends, and sometimes when you change your computer's clock when traveling across timezones. The simplest fix is simply to delete the files from your local snapshot, and let a cvs update recreate them from scratch. If it's actually related to the lack of -kb (beats me!), Fred (Drake) knows how to get that flag set retroactively.
Tim Peters writes:
If it's actually related to the lack of -kb (beats me!), Fred (Drake) knows how to get that flag set retroactively.
Fredrik's diagnosis was good; that was exactly the behavior I'd expect to see on a platform with different line-termination characters than the server when dealing with CVS clients as finicky as those found on Windows. ;-) The fact that it was just these files certainly helps isolate the problem as well; what you see happens only with time-related changes and involves all the files currently in your checkout. -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Zope Corporation
Fredrik Lundh writes:
You can adjust the -k* options using "cvs admin". I just did: cvs admin -kb plusnode.gif minusnode.gif to fix it for those two files; you might get one more update to correct what you have now, but things should work as expected after that. Thanks for pointing this out! -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Zope Corporation
[Fredrik Lundh]
You're not going to believe this, but I swear it's true: this happens on Windows boxes when daylight saving time starts or ends, and sometimes when you change your computer's clock when traveling across timezones. The simplest fix is simply to delete the files from your local snapshot, and let a cvs update recreate them from scratch. If it's actually related to the lack of -kb (beats me!), Fred (Drake) knows how to get that flag set retroactively.
Tim Peters writes:
If it's actually related to the lack of -kb (beats me!), Fred (Drake) knows how to get that flag set retroactively.
Fredrik's diagnosis was good; that was exactly the behavior I'd expect to see on a platform with different line-termination characters than the server when dealing with CVS clients as finicky as those found on Windows. ;-) The fact that it was just these files certainly helps isolate the problem as well; what you see happens only with time-related changes and involves all the files currently in your checkout. -Fred -- Fred L. Drake, Jr. <fdrake at acm.org> PythonLabs at Zope Corporation
participants (3)
-
Fred L. Drake, Jr. -
Fredrik Lundh -
Tim Peters