Re: Merging libgtop2 into HEAD

[Michael Meeks <michael ximian com>]

Hi Kevin,

On Wed, 2002-01-09 at 20:48, Kevin Vandersloot wrote:
> 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.

	This sequence will branch libgtop2 for the stable branch, and then
merge your branch to HEAD - which is most likely what you want to do.

	cvs -z3 checkout libgtop
	cd libgtop
	cvs -z3 tag -b gnome-1-4-branch
	cvs -z3 upd -Pd -r MY_LIBTOP_BRANCH
	cvs -z3 upd -Pd -A
	[ resolve conflicts, test etc. ]
	cvs -z3 commit.

	I hope that's what you want :-)

	Regards,

		Michael.

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot