On Mon, Jul 17, 2000 at 07:44:42PM -0700, Robert Jacob wrote:
> Is it possible to move file revisions that are currently checked in and
> tagged on the main trunk
> onto a branch? My situation is that I *should* have been doing some
You can move changes between any two points to just about anywhere. Main
branch or no.
You said you had the point you want to return to tagged. Good. Makes life
easier. Let's call that tag GOOD. Let's say that the branch you want to
work on is TEST.
First, make sure everything is currently committed, and you're on the
mainbranch.
Just for convenience sake, we'll assign another tag to the current stuff.
cvs tag OOPS
Now, go to the test branch:
cvs update -r TEST
Bring over the changes:
cvs up -j GOOD -j OOPS -kk
(-kk is optional, but I use it a lot and try to worry about the -kb files
later).
Do some testing, take care of conflicts, etc.
cvs commit -m "brought over changes accidently done on main branch"
Go back to main branch:
cvs up -A
Undo accidental changes:
cvs up -j OOPS -j GOOD -kk
Note the order: we're going back from OOPS to GOOD!
More testing and conflicts, though shouldn't be. Unless maybe funkyness
with new files added? Might want to do file listings of both tags and diff
them.
cvs commit -m "undid accidental changes done on main branch"
cvs tag GOOD_TAKE_2
All in all, about 6 cvs commands. Done this a few times myself, though
been a while.
Might want to practice the above on a scrach repository just to make sure I
have the things correct.
mrc
--
Mike Castle Life is like a clock: You can work constantly
[EMAIL PROTECTED] and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
