Re: [cmake-developers] fixing a bug after topic was merged to master

2015-02-08 Thread Rolf Eike Beer
Domen Vrankar wrote:
> Hi all,
> 
> While writing tests for a new topic I found a bug in an older topic
> that I wrote.
> The that topic was already merged to master (last week) but remote
> stage branch still exists.
> The fix is trivial - one variable typo.
> 
> How can I get the fix both into master and next release candidate branch?
> Should I create a new topic and push that to next or should I extend
> the old one even though it was already merged to master and push that
> one to next?

Just create a new branch based on origin/release and merge to next.

Eike
-- 

signature.asc
Description: This is a digitally signed message part.
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] fixing a bug after topic was merged to master

2015-02-08 Thread Domen Vrankar
Hi all,

While writing tests for a new topic I found a bug in an older topic
that I wrote.
The that topic was already merged to master (last week) but remote
stage branch still exists.
The fix is trivial - one variable typo.

How can I get the fix both into master and next release candidate branch?
Should I create a new topic and push that to next or should I extend
the old one even though it was already merged to master and push that
one to next?

Thanks,
Domen
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers