Re: recommendation for patch maintenance

From: Manlio Perillo <manlio.perillo@gmail.com>
Date: Dec 21, 2012, 17:29 UTC
Message-ID: <50D49C81.5060007@gmail.com>
In-Reply-To: <7vvcbv1grr.fsf@alter.siamese.dyndns.org>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Il 21/12/2012 18:01, Junio C Hamano ha scritto:

Show 21 quoted lines

> 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).
>>
> [...]
>> 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?

I lose the history of all the changes I have made to produce the final version of a patch.

Since for every new version of a patch I do a commit --amend, I can not see, as an example, the changes I have made between x and y versions of a patch.

Of course the commits are not really lost, but I have to search them using the reflog.

Thanks   Manlio
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlDUnIAACgkQscQJ24LbaUTf0QCfX9WtA+/GLzVWDJFPbLMCPucJ bKQAnj0HJuQs9SVCPV/TlDXcpGDqIqfD =lhZ5 -----END PGP SIGNATURE-----