Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
On 10/25/2011 5:11 PM, Alexander Neundorf wrote: On Tuesday 25 October 2011, Stephen Kelly wrote: ... I think I read somewhere that next gets re-branched from master periodically. How often does that happen? Usually every Tuesday. The Tuesday meetings are when we consider merging topics into master. The 'next' branch has never been rewritten. However, we have once reverted all changes on it back to match master, rebased all the remaining topics onto master, and merged them again to 'next'. This gave us a clean breaking point in the history of 'next' so we can exclude old history from our view without actually rewriting it. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
Brad King wrote: On 10/19/2011 11:14 AM, Stephen Kelly wrote: On 10/19/2011 6:04 AM, Stephen Kelly wrote: I saw that the weekly merge of branches into master happened yesterday, but the cmake-link-interface-libraries branch didn't make the cut. [snip] Not a major rush anyway. I'm still trying to get used to the cmake development and release model. The work on the target_link_libraries test is much more comprehensive than just this one CMAKE_LINK_INTERFACE_LIBRARIES feature, and as you discovered much harder to complete. I published two branches here: https://github.com/bradking/CMake/branches The cmake-link-interface-libraries branch is a rewritten version of your branch that takes just the part for the new feature. The second test-target_link_libraries branch is a rewritten version of the rest of your branch that adds the test, and is based on the first branch. The end of the second branch has an identical Git tree object as the current stage/cmake-link-interface-libraries branch (at d951f012). I'd like to replace your branch on the stage with these two so we can merge the feature and leave the comprehensive test as a work in progress for now. Is that okay with you? Yes, that's ok with me. I guess I can continue to create separate branches for tests and features in the future too. I've just merged the target-link-libraries-interfaces branch into next, so I can maybe add tests for that feature whenever the test-target_link_libraries is more ready. What work needs to be done for test-target_link_libraries to leave the wip state? 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. Can I squash them in the stage clone if you push those branches there? Do I have karma to push -f to stage? Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
On 10/25/2011 06:09 AM, Stephen Kelly wrote: I've just merged the target-link-libraries-interfaces branch into next, so I can maybe add tests for that feature whenever the test-target_link_libraries is more ready. Sounds good. What work needs to be done for test-target_link_libraries to leave the wip state? I need more time to look through the test to see how it works and determine whether it exposes any problems that can be fixed. 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. Can I squash them in the stage clone if you push those branches there? Yes. I just overwrote cmake-link-interface-libraries on the stage with the rewritten version that has just the feature. Then I added the new topic test-target_link_libraries and merged it to next. The net result in 'next' is unchanged but the history is separated between the topics. Feel free to rewrite test-target_link_libraries. We will probably merge the new cmake-link-interface-libraries to master later today (since the net change for the feature has already been sitting in next for a while). 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. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
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. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
On Tuesday 25 October 2011, Stephen Kelly wrote: ... I think I read somewhere that next gets re-branched from master periodically. How often does that happen? Usually every Tuesday. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
On 10/19/2011 11:14 AM, Stephen Kelly wrote: On 10/19/2011 6:04 AM, Stephen Kelly wrote: I saw that the weekly merge of branches into master happened yesterday, but the cmake-link-interface-libraries branch didn't make the cut. [snip] Not a major rush anyway. I'm still trying to get used to the cmake development and release model. The work on the target_link_libraries test is much more comprehensive than just this one CMAKE_LINK_INTERFACE_LIBRARIES feature, and as you discovered much harder to complete. I published two branches here: https://github.com/bradking/CMake/branches The cmake-link-interface-libraries branch is a rewritten version of your branch that takes just the part for the new feature. The second test-target_link_libraries branch is a rewritten version of the rest of your branch that adds the test, and is based on the first branch. The end of the second branch has an identical Git tree object as the current stage/cmake-link-interface-libraries branch (at d951f012). I'd like to replace your branch on the stage with these two so we can merge the feature and leave the comprehensive test as a work in progress for now. Is that okay with you? Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Merging cmake-link-interface-libraries into master?
Brad King wrote: On 10/19/2011 6:04 AM, Stephen Kelly wrote: I saw that the weekly merge of branches into master happened yesterday, but the cmake-link-interface-libraries branch didn't make the cut. Thanks for your work on this. So I'd like to know: 1) What made it not get merged? 2) What has to change for it to get merged in? I said last week I wouldn't be able to review it thoroughly for at least two weeks. That means not until next week at the earliest. Ah I see. I forgot about that and when it was you said that. Not a major rush anyway. I'm still trying to get used to the cmake development and release model. Sorry for the noise, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
