[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Advice on proper use of CVS
From: |
Jim.Hyslop |
Subject: |
RE: Advice on proper use of CVS |
Date: |
Fri, 7 Jan 2005 09:29:58 -0500 |
Pico Geyer wrote:
> I have the following scenario:
> A member of our team is updating one of our build files (build.xml).
> Problem is he has made mistakes and committed them to CVS, now none of
> the team can build their code.
> I guess we should be going back to the old version until the
> problem is
> fixed.
>
> What is the proper approach to this?
> This is my game plan: (Comments/advice/corrections welcome)
>
> cvs -Q update -p -r 1.7 build.xml > build.xml (1.8 being the latest
> version)
> cvs ci -m "reverted to 1.7 code"
>
> Now we can compile our projects again.
>
>
> We should now all have version 1.9 after doing an update. Now
> the person
> needs to fix the error so he must get version 1.8 .Here is where I'm
> really confused.
The person who needs to fix the error should issue the same command as
above, but get rev 1.8:
cvs -Q update -p -r 1.8 build.xml > build.xml
Now away you go.
> One more question:
> If I make changes to a local copy of a file, but want to discard them.
> Should I just delete the file and then run update on the project?
That's one option. Another is to use the -C option for update. The -C option
renames the original file, so it's not deleted totally.
Don't forget, you can also specify single files to run the command against -
instead of updating the whole project (which could be time-consuming if the
project is large) just update the file or files that are affected.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( http://www.leitch.com )
Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )