Hard Light Productions Forums

Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Topic started by: Aardwolf on May 29, 2009, 08:25:10 pm

Title: Recent Merging of Branches?
Post by: Aardwolf on May 29, 2009, 08:25:10 pm

So I noticed a bunch of Karajorma's (and Wanderer's?) stuff is getting merged into /trunk, and was wondering if any of WMC's stuff was also due to be merged in?

Anybody know?

Title: Re: Recent Merging of Branches?
Post by: chief1983 on May 30, 2009, 12:17:04 am

You had to go there, didn't you Sally (sorry, been watching a lot of Scrubs lately).

Title: Re: Recent Merging of Branches?
Post by: karajorma on May 30, 2009, 02:09:30 am

We have WMC's code. The problem is finding the time to go through it all and merge it into trunk one patch at a time.

You may have noticed that Wanderer and I didn't simply dump our entire branch into trunk in one big commit. We added each feature in a separate commit so that the nightly builds could be used to track down any problems they caused. When it comes to WMC's code, all I have is an outdated 140KB diff file. Much of which I don't immediately understand because it relates to parts of the code I've never used before.

Now if someone else wants to do some of that work and prepare their own series of changes.... :D