Rework a patch serie

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 ?

Thanks for your advices

Francis

moreau francis wrote:

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.

On 2006-06-27 08:41:30 +0000, moreau francis wrote:

stgit is a good fit for this situation. You just pop patches off the stack untill you reach the one you want to modify, then do your changes, refresh the patch, and push the other patches back. (If you want to keep the original series for future reference, you can simply tag HEAD before you embark on this procedure.)