The best way depends on what version control software you are using. Using perforce terminology, basically what you want to do is have a branch in your version control system which represents the unmodified sdk code. You start your project by checking in the unmodified code and then branching your project off of that. When you get a new drop from valve, check that code into the valve branch and integrate it into your project. That will perform the merge in a "smart" fashion. Cvs, subversion, etc will use similar methods.
-----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Nuno Ramiro Sent: Tuesday, June 10, 2008 2:01 PM To: Discussion of Half-Life Programming Subject: Re: [hlcoders] Few questions about SDK Thanks! About the merge of the code, is there a quick way? Or you don't know any other than diff tool? On Tue, Jun 10, 2008 at 9:42 PM, Tobias Kammersgaard < [EMAIL PROTECTED]> wrote: > 1) A message will usually be posted here when a code update is released. > 2) No. The source code in the SourceSDK.gcf only updates when a code update > is released. > > /ScarT > > > On 10/06/2008, Nuno Ramiro <[EMAIL PROTECTED]> wrote: > > > > Greetings, > > > > After a few problems I managed to generate the SDK for OrangeBox, and I > am > > starting to play with it. > > > > Now I have a few questions: > > > > - How do I know when the SDK/Code has changed? > > - Everytime there's a Steam update the SDK changes? > > - Is there an effective way to merge those changes? Other than manually > or > > with a diff tool. > > > > Thank you for your time. > > Nuno Ramiro > > _______________________________________________ > > To unsubscribe, edit your list preferences, or view the list archives, > > please visit: > > http://list.valvesoftware.com/mailman/listinfo/hlcoders > > > > > _______________________________________________ > To unsubscribe, edit your list preferences, or view the list archives, > please visit: > http://list.valvesoftware.com/mailman/listinfo/hlcoders > > -- Nuno Ramiro _______________________________________________ To unsubscribe, edit your list preferences, or view the list archives, please visit: http://list.valvesoftware.com/mailman/listinfo/hlcoders _______________________________________________ To unsubscribe, edit your list preferences, or view the list archives, please visit: http://list.valvesoftware.com/mailman/listinfo/hlcoders
