[libdispatch-dev] Merging Lion branch to trunk

[Daniel A. Steffen]

On Jul 30, 2012, at 18:30, Mark Heily <mark at heily.com> wrote:

> On 07/30/2012 04:59 PM, Daniel A. Steffen wrote:
>> I'm preparing for the opensource release of the MountainLion libdispatch to the macosforge repository.
>> 
>> As part of that effort I'm planning to merge the Lion branch
>> 	http://svn.macosforge.org/repository/libdispatch/branches/Lion
>> to trunk (replacing the trunk with the branch).
>> 
> 
> Thanks!
> 
> Wouldn't it be easier for you to just merge the MountainLion sources to the
> trunk and skip the intermediate step of merging the Lion sources? I would
> prefer to submit portability patches against the MountainLion branch instead
> of Lion. It would also be easier for you to integrate patches against the
> latest shipping version of OS X.

oh sure, that will be the ultimate state of things, sorry if I was unclear, the plan is to do both of these at the same time:

- merge Lion branch to trunk
- commit MountainLion sources to trunk (on top of what is currently the tip of the Lion branch)

the Lion sources included a big re-org of the source tree so that would need to happen on trunk regardless, merging the Lion branch is actually easier than re-doing that

Daniel