Game Development Community

CVS vendor merge

by Ron Yacketta · in Torque Game Engine · 03/21/2003 (8:03 pm) · 4 replies

Folks,

I am attempting to merge TGE source that I have in my own repository with TGE HEAD in GG CVS. I have tried steps outlined at the base of the article here , but no matter what I do the merge tree is ALWAYS GG TGE HEAD *boggle*.

I have several of my own files etc and changes in my personal repository that are just being destroyed on the checkout merge. Can anyone shed some light on this?

I even went as far as creating a clean repository as suck

cvs import -m "Test merge" merge TMERGE TGE_1
I then imported the GG HEAD as such
cvs import -m "GG Test merge" merge TMERGE TGE_2
I then checkout as such

cvs checkout -jTGE_1 -jTGE_2 merge

according to the doc the darn source trees should be merged, correct? where have I gone wrong?

-Ron
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Torque Owner Prairie Games
Prairie Games, Inc.
#1
03/21/2003 (8:17 pm)
THE place for all your CVS needs: http://cvsbook.red-bean.com

Specifically http://cvsbook.red-bean.com/cvsbook.html#Tracking_Third-Party_Sources__Vendor_Br...

I like how he holds your hand... with CVS gawd knows we need it :)

-J

Torque Owner Alex \"bathala\" Rufon
#2
03/21/2003 (9:01 pm)
Hello Ron,

I use my one CVS repository but ... but since I know for a fact that my version have been heavily modified for my game ... I just dont a direct CVS merge.

What I do is download the Torque HEAD on another directory and do a DIFF on my "dirty" copy. To do this coherently, I use a 3rd party utility. I would personally recommend Araxis Merge although a friend of mine would say ExamDiff. :)

What I do is Tag the current copy of my CVS (as insurance) then do a compare on the two directories and merge them into my copy. I would then compile and test ... if no problems, I would then commit the merge files into CVS.

So far, I have not encountered any problems. Of course, the downside of this is that I have to examine each files modified and try to figure out if I really need the new changes.

Alex

Associate Ron Yacketta
#3
03/22/2003 (5:10 am)
Josh,

That is where I started off at :( I recall you tossing me that link ages ago when you spoke of writing up a resource regarding this hair pulling exp.

Needless to say my cvs repository is now scrogged, wondering if I could do a checkout with a date about 10 mins after the last update. The take that a copy/paste (exluding the CVS dirs) ontop of the scrogged one and then force a commit.

-ROn

Torque Owner J. Donavan Stanley
#4
03/22/2003 (5:55 am)
Alex,

Araxis Merge may be jus tthe thing I need to track down the missing TerrainManager changes. Thanks for the link!