RE: Branch tag broke my CVS - how can I repair it?

2005-01-26 Thread Conrad T. Pino
1. Delete the branch tag from the problem file: cvs tag -Bd cm_av_bug321 access_log.c 2. Delete working copy of the file: rm access_log.c 3. Update file and remove sticky tag: cvs update -A access_log.c 4. Retag the file: cvs tag -b cm_av_bug321 access_log.c

RE: Branch tag broke my CVS - how can I repair it?

2005-01-26 Thread Jim.Hyslop
Conrad T. Pino wrote: 1. Delete the branch tag from the problem file: [...] 5. Switch to branch for all files: 6. Smack your colleague upside the head for misusing the cvs admin command. -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. ( http://www.leitch.com )

Re: Branch tag broke my CVS - how can I repair it?

2005-01-26 Thread Larry Jones
Jim.Hyslop writes: 6. Smack your colleague upside the head for misusing the cvs admin command. Just to expand on this a bit: The correct way to undo changes is use a merge to reverse the unwanted changes and then commit a new revision. What your colleague should have done was: cvs

RE: Branch tag broke my CVS - how can I repair it?

2005-01-26 Thread Matt Doar
months ago. ~Matt -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Jim.Hyslop Sent: Wednesday, January 26, 2005 8:53 AM To: info-cvs@gnu.org Subject: RE: Branch tag broke my CVS - how can I repair it? Conrad T. Pino wrote: 1. Delete