Re: Merging libgtop2 into HEAD

[Havoc Pennington <hp redhat com>]

Kevin Vandersloot <kfv101 psu edu> writes:
> Hi. I need some help in merging the libgtop2 branch into HEAD since I'm
> not too knowledgable with cvs. What is the proper and easiest way to do
> this? The branch I want to merge was created from the stable branch.
> Should I first revert the changes from HEAD back to where stable was
> originally branched and merge in the gnome2 branch or is there an easier
> way? I appreciate any help.
> 

I don't know if there's an easy way - what you describe there is
probably what I would try, yeah. diff HEAD vs stable, reverse apply
that patch, diff your branch vs. stable, apply that patch to HEAD,
commit. Or something like that. ;-)

Havoc