Re: Rework a patch serie

From: Andreas Ericsson <ae@op5.se>
Date: Jun 27, 2006, 08:53 UTC
Message-ID: <44A0F1F7.9010503@op5.se>
In-Reply-To: <20060627084130.28886.qmail@web25814.mail.ukl.yahoo.com>

moreau francis wrote:

Show 28 quoted lines

> Hello
> 
> Several times I have a topic branch that contains several commits like
> this:
> 
>             "master"
>         o---o
>              \                    "topic"
>               o---o---o---o---o---o
> 
> 
> When I think everything is in a good shape I generate several patches to
> submit them. For that, I do:
> 
>         $ git checkout topic
>         $ git-format-patch -s -k -n master
>         001-aaa.patch
>         002-bbb.patch
>         [...]
>         006-fff.patch
> 
> Then I submit these patches for reviewing. Unfortunately, they're not perfect,
> so after some feedbacks from the communauty it appears that I need to make
> small modifications in the second commit in the topic branch for example...
> 
> What is the best and fastest way to do that ? Should I create a new topic branch
> and cherry pick from the old one ?
>

It really depends on what the problem is. If it's a thinko in the design 
I usually find it worth keeping to avoid falling in the same trap again. 
  I do the same for bugfixes, although some don't like that (I'm lazy, 
they're anal). In this case, patches go on top of topic. Typos and stuff 
can usually be changed inside the patch-file, in which case you can just 
apply them to a new topic-branch.

It all boils down to how lazy you are, how much of your f***ups you want to preserve (they *are* useful sometimes) and what you prefer, really.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231