[TYPO3-core] How to update older patch sets to new master situation?

[Andreas Wolf]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

Am 21.06.2011 13:44, schrieb Xavier Perseguers:
>> I almost wanted to make the modifications manually (it's only two lines
>> which are changed/added), but to make Gerrit understand that it is a new
>> version of an existing patch I probably have to tinker with the commit
>> message...
> 
> Quick and (a bit) dirty but working way:
> 
> - cherry-pick or apply patch on a fresh branch

usually it should work to do a simple fetch and then git cherry-pick
FETCH_HEAD. I didn't test that, but it sounds reasonable to me.


> - if commit message was not taken (patch), copy/paste it with gerrit
> reference (do not forget to reset the original author with --author !!!)

You can also take the original commit message with git commit -C
<commit-pointer>. This will also work for FETCH_HEAD.

- -C takes the message as it is and does the commit, -c copies the message
and brings you to an editor.


> - commit amend to generate a new hash

Why would you want to generate a new message if the patch is for an
existing review request?


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

iEYEAREIAAYFAk4B6u8ACgkQHWtXp155bP/gDgCeM4zq1RRjDt2uEao41+jOtoAt
rPAAnR5CtnDR9m/ZE/bKqDK6pIDHoqeU
=/KfV
-----END PGP SIGNATURE-----