At 11:30 -0500 4/11/02, [EMAIL PROTECTED] wrote:
>"an unmodified copy of your file is also in your working directory, with the
>name `.#file.revision' where revision is the revision that your modified
>file started from. (Note that some systems automatically purge files that
>begin with `.#' if they have not been accessed for a few days. If you intend
>to keep a copy of your original file, it is a very good idea to rename it.)"
So, here I have an unmodified foo.h version 1.17 and I update it
accidently and get version 1.18. There doesn't seem to be a .#foo.h
in this case (at least, it isn't in my sandbox anymore). No problem!
I can make one with
cvs update -p -r 1.17 foo.h > '.#foo.h.1.17'
>cd to your work area
>ls -la (and you should see the .#file.revision file)
>mv ".#file.revision" file (to overlay your modified file prior to the
>update)
Now, what happens if I forget that I did this and commit the file? I
wipe out the changes between 1.17 and 1.18 made by the other
programmer. Not good. This is worse than forgetting to update -A
after a update -r 1.17 because I've made problems for everyone, not
just for myself.
I could edit CVS/Entries by hand and replace the 1.18 with 1.17. That
would fix the problem, but I'm wondering if there's a cvs way to do
it.
At 12:27 -0400 4/11/02, Rajesh Patwardhan wrote:
>depends if you dont care for the changes at all then
>if you want you can delete the file and then do a cvs up, old
>revision will be back.
No, I'll get 1.18 and I want 1.17.
Fred
--
Fred Brehm, Sarnoff Corporation, [EMAIL PROTECTED]
http://www.sarnoff.com/digital_video_informatics/vision_technology/index.asp
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
