[ On Wednesday, April 2, 2003 at 13:44:00 (-0500), Eric Siegerman wrote: ] > Subject: Re: Ignore local changes? > > No, but you can get part-way there, by explicitly updating to > the HEAD revision of the file. Find out what the HEAD revision > is (for the sake of argument, say it's 1.4), and type: > cvs update -r1.4 myfile
That's a really good suggestion Eric! It is perhaps the only other good reason to ever use sticky revisions! (the first reason is of course to simply avoid repository changes) > So this trick only gives you one of your two requirements, but > arguably the more important one. The mistake it prevents you > from making is the one that would affect other peoples' work, > while the mistake it still permits will affect only your own. I've always wondered if maybe there shouldn't be an indicator of sticky files (specifically only those with sticky revisions, not sticky branch tags), such as maybe 'S': $ cvs update S newfile.c Of course if it really is modified locally then you will see that indicated even with no new hacks: $ cvs update M newfile.c But maybe it should have a different flag letter anyway... ('m'?) Maybe we also need a second new flag to indicate a modified sticky file that's also out-of-date, i.e. like 'J' but for sticky files? An 'S' overstruck with a 'J' looks a bit like an '8'.... :-) (but 'j' would work for me too! ;-) Then of course we'd need a third new flag for sticky unmodified files that are just out of date. ('u'?) Right now the worse problem is that 'cvs status' doesn't show the truth about the current repository revision of a sticky file (at least it doesn't in 1.11.1.1 -- maybe I should upgrade! ;-): $ cvs status newfile.c =================================================================== File: newfile.c Status: Up-to-date Working revision: 1.1 Sat Mar 16 20:10:40 2002 Repository revision: 1.1 /cvs/test/tdoc/newfile.c,v Sticky Tag: 1.1 Sticky Date: (none) Sticky Options: (none) $ cd - /home/proven/woods/tmp/t-tdoc2 $ cvs status newfile.c =================================================================== File: newfile.c Status: Up-to-date Working revision: 1.2 Wed Apr 2 20:07:39 2003 Repository revision: 1.2 /cvs/test/tdoc/newfile.c,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) -- Greg A. Woods +1 416 218-0098; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]> Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]> _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs