|
From: | Frederic Brehm |
Subject: | Re: How do you "unupdate" a file |
Date: | Thu, 11 Apr 2002 16:58:44 -0400 |
Frederic Brehm writes:I updated a file by mistake and I'm not ready to integrate its changes with my current sandbox. An "update -r old.rev" will fix things up, but it sets a sticky tag.That's exactly what you want.I'll probably forget (call it a senior moment :-) to "update -A" until I thrash around a bit and figure out what's wrong. It would be nice to avoid the time wasted while thrashing around.Hardly -- when you try to commit, CVS will tell you that you can't because you've got a sticky tag that isn't a branch. You should immediately know what to do when that happens.
I just tried that. cvs update -r 1.17 foo.h cd .. cvs commit No errors! (but, I aborted the commit) Is that a bug in CVS? I'm using CVS client and server 1.11.1p1 on Solaris 2.6I'm not trying to change foo.h. I'm working on some other files that #include foo.h. The changes made to foo.h by the other programmer are good, but I'm not ready to merge all the changes that go with the new version of foo.h.
I guess I could create a branch and continue development on the branch, but at this point that would be more work than it's worth. (And, I'm sure to remember update -A this time!)
Thanks, Fred -- Fred Brehm, Sarnoff Corporation, address@hidden http://www.sarnoff.com/digital_video_informatics/vision_technology/index.asp
[Prev in Thread] | Current Thread | [Next in Thread] |