Author Topic: Recent Merging of Branches?  (Read 1402 times)

0 Members and 1 Guest are viewing this topic.

Offline Aardwolf

  • 211
  • Posts: 16,384
Recent Merging of Branches?
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?

 

Offline chief1983

  • Still lacks a custom title
  • Moderator
  • 212
  • ⬇️⬆️⬅️⬅️🅰➡️⬇️
    • Skype
    • Steam
    • Twitter
    • Fate of the Galaxy
Re: Recent Merging of Branches?
You had to go there, didn't you Sally (sorry, been watching a lot of Scrubs lately).
Fate of the Galaxy - Now Hiring!  Apply within | Diaspora | SCP Home | Collada Importer for PCS2
Karajorma's 'How to report bugs' | Mantis
#freespace | #scp-swc | #diaspora | #SCP | #hard-light on EsperNet

"You may not sell or otherwise commercially exploit the source or things you created based on the source." -- Excerpt from FSO license, for reference

Nuclear1:  Jesus Christ zack you're a little too hamyurger for HLP right now...
iamzack:  i dont have hamynerge i just want ptatoc hips D:
redsniper:  Platonic hips?!
iamzack:  lays

  

Offline karajorma

  • King Louie - Jungle VIP
  • Administrator
  • 214
    • Karajorma's Freespace FAQ
Re: Recent Merging of Branches?
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
Karajorma's Freespace FAQ. It's almost like asking me yourself.

[ Diaspora ] - [ Seeds Of Rebellion ] - [ Mind Games ]