[TYPO3-core] How to update older patch sets to new master situation?
Jigal van Hemert
jigal at xs4all.nl
Tue Jun 21 12:56:47 CEST 2011
I tried to update https://review.typo3.org/2324 to the current state of
master to push a new patch set and submit it.
If use the command from Gerrit to fetch the patch and create a new
branch (following the wiki) there are no errors, but looking at the log
I basically reproduced the situation from the time the patch was
created. Also the current submodules are not like they are now. This
will certainly not be merged by Gerrit.
The 'normal' procedure then. Create a new branch based on master. Fetch
patch and fix the stuff for the submodules (it still beats me why on
earth these submodules are broken for a patch which has nothing to do
with any files in those directories).
This way the fetch action has no result at all. ToirtoiseGit reports
success, but the log doesn't show a new commit and also the file
contents have not changed.
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
How do I get this two-line patch in???
Kind regards / met vriendelijke groet,
Jigal van Hemert.
More information about the TYPO3-team-core