Kai Großjohann
Mon, 16 Jul 2001 02:37:25 -0700
On Sun, 15 Jul 2001, Kai Großjohann wrote:
> Once upon a time, I forked a `stable' branch. Then I made changes
> to the stable branch as well as the head. Now I want to say:
> whatever is in the head that seems stable enough, so just update my
> stable branch to whatever is in the head.
Okay. I went to the working directory for the stable branch and said
cvs update -jHEAD
and then I used `d E' from PCL-CVS on the files which had a conflict.
Inside that emerge, I always chose the `b' version (the one from the
repository). Then I saved all files. That seemed to do the trick.
It would still be interesting to know whether there would have been a
less manual method, though.
kai
--
~/.signature: No such file or directory