[cmake-developers] Adding argument "OPTIONAL" to find_package() and add_subdirectory

[Michael Wild]

On 06/23/2011 04:11 PM, Brad King wrote:
> On 06/23/2011 09:53 AM, Alexander Neundorf wrote:
>> On Thursday 23 June 2011, Brad King wrote:
>>> On 06/23/2011 05:12 AM, Alexander Neundorf wrote:
>>>>> Please put it at the very bottom of the entire
>>>>> documentation, just above the note about NO_POLICY_SCOPE.
>>>>
>>>> Done.
>>>
>>> Thanks.  The topic looks good.  Please merge it to 'next' when
>>> you're ready.
>>
>> Won't this have the effect that it will be in 2.8.5 ?
> 
> No.  We manually select topics from 'next' and merge them to 'master'.
> Only topics in master will be released.
> 
>   http://www.cmake.org/Wiki/CMake/Git#Branches
> 
> -Brad

So, how does that work? Do you look for the merges in 'next' that you
like, and then re-merge them to 'master' directly from the topic-branch?

Something like this?


-- A ------------------------ I -- master
    \   \   \                /
     \   \   C --- D ------ G -- topic2
      \   \                  \
       \   B -- D -- topic1   \
        \        \             \
         \------- F ------------H -- next

i.e. everything starts at A, 'master' and 'next' being identical. Then,
someone creates 'topic1' and merges it into 'next' (commit F).
Meanwhile, another topic, 'topic2' is created, and also merged into
'next' (commit H). Now, 'topic1' just isn't ready, but 'topic2' is, so
it gets merged into 'master' (commmit I). Is this correct?

Is 'next' kind of your "throw-away" integration branch? Do you rebase it
regularly onto master?

Michael