[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Advice on proper use of CVS

From: Larry Jones
Subject: Re: Advice on proper use of CVS
Date: Fri, 7 Jan 2005 09:30:07 -0500 (EST)

Pico Geyer writes:
> 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"

That works fine.  Another approach is to use a reverse merge to back out
the change:

        cvs up -j1.8 -j1.7 build.xml

That's a bit less typing and it also preserves any local changes that
have been made to the file, but that's not a concern in your case.

> 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.

Simply use either of the previous techniques again:

        cvs up -p -r1.8 build.xml >build.xml
        cvs up -j1.9 -j1.8 build.xml

Then make whatever corrections are required and commit.

-Larry Jones

My "C-" firmly establishes me on the cutting edge of the avant-garde.
-- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]