[cmake-developers] Merging cmake-link-interface-libraries into master?

[Stephen Kelly]

Brad King wrote:
> 
>> What does CMake think  about rebasing? I much prefer to squash a branch
>> like test-target_link_libraries into fewer commits so that eg adding
>> newlines and changing tests to examine dashboard changes are not separate
>> commits. I don't think those commits add value, but only noise.
> 
> I agree.  We have no problem with rewriting topics that have not yet been
> merged to master.  If you rewrite a topic such that the net change is the
> same as what is already in next then it should merge cleanly.  We have a
> process during our merge meeting to identify pieces of next's history that
> have been rewritten and exclude them from consideration for master.

Cool, I've rebased and force pushed the branch now.

>> Do I have karma to push -f to stage?
> 
> Yes, but use with care.  You can easily erase someone else's topic.
> Also don't forget that the tip of the topic must be identical after
> rewriting in order to merge cleanly to next with the old version.

I accidentally'd this a little bit. 

My rewrite had some extra cleanups that were not already on the branch, so 
after I push -f'd, I couldn't merge it to next again.

I just put the extra cleanups in another branch, merged that to next, and 
then was able to merge my cleaned up branch. So the net result currently 
should be a working clean branch.

I think I read somewhere that next gets re-branched from master 
periodically. How often does that happen?

Thanks,

Steve.