[cmake-developers] Request to review topic "codelite-ide-generator"

[Eran Ifrah]

On Thu, Jan 9, 2014 at 11:15 PM, Brad King <brad.king at kitware.com> wrote:

> On 01/09/2014 03:39 PM, Eran Ifrah wrote:
> > How do I revert a topic? I can't seem to find it on the wiki
>
> There are a few approaches depending on the complexity
> of the topic.  It is a bit tricky, especially if there
> are merges in the topic.  Explaining all the possibilities
> would take too much space for the basic workflow instructions
>
I agree. I read the wiki about the 2 approaches of merging topics and I
have to say I "git" lost in there ...
My git knowledge is limited and I don't feel comfortable enough to try all
the things described there - this is why I decided to ask from
one of you to revert the topic from "next" so the build will not be red ;)

on the Wiki.  Again, it has been pretty rare that this is
> needed.  It was just bad luck that it happened on your first
> topic ;)
>
> I reverted the topic from 'next' for you so that you can
> merge the rebased topic.  Since it is coming back in as a
> brand new topic you can safely squash the fixup changes
> back into the original commit before merging to 'next'.
>
> Does this mean that I can start from scratch now? (i.e. new topic, with
new name ;) )

> FYI, one approach to revert a simple linear topic from
> 'next' is to extend the topic with 'git revert' commits
> in reverse order.  Merging that to 'next' will undo the
> effects of the topic.  Note that 'next' is only for testing
> so topics merged to it can contain mis-steps and fixes.
> We always clean up topic history if necessary before
> merging to 'master'.
>
> See above about my git knowledge

I am more of an SVN guy... I am using git, but I am still thinking the
"Subversion" way

> -Brad
>
>


-- 
Eran Ifrah
Author of codelite, a cross platform open source C/C++ IDE:
http://www.codelite.org
wxCrafter, a wxWidgets RAD: http://wxcrafter.codelite.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20140109/ca7565ac/attachment.html>