From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Dec 2012 17:01:12 GMT
Subject: Re: recommendation for patch maintenance
Message-ID: <7vvcbv1grr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <50D475EF.6060303@gmail.com>

Manlio Perillo <manlio.perillo@gmail.com> writes:

> I would like to have advices about some possible workflows to use when
> maintaining a patch, that can evolve over the time (fixing bugs, and
> applying advices from reviewers).
>
> In my case I have a single commit to maintain.
>
>
> The workflow I use now is this:
>
>   1) create a topic branch, e.g. mp/complete-path
>   2) write code
>   3) commit
>   4) format-patch --output=mp/complete-patch master
>   5) review the patch
>   6) send-email
>
> when I need to update the patch:
>
>   1) modify code
>   2) commit --amend
>   3) format-patch --subject-prefix="PATCH v<n>" \
>      --output=mp/complete-patch master
>   4) edit patch to add a list of what was changed
>   5) review the patch
>   6) send-email
>
> This is far from ideal, since all my local changes are lost.

Not offering any answer, but it is unclear to me what local changes
you are losing here.  Care to explain?