force push in php-src ([Fwd: [PHP-CVS] com php-src: Merge branch 'phpdbg' into PHP-5.6: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg.h
sapi/phpdbg/phpdbg_cmd.c sapi/phpdbg/phpdbg_opcode.c sapi/phpdbg/phpdbg_prompt.c])

Hi, we had a wrong merge in the php-src, merging master into 5.6. I fixed that. In case you pulled after Fri, 27 Dec 2013 18:10:58 GMT you might receive an error while pulling. The broken tree was backed up at https://github.com/johannes/php-src/tree/broken-5.6-20140118 a screenshot of gitk of fixed&broken state can be seen at http://schlueters.de/Screenshot-gitk:%20php-master.png In case you *pulled* between that wrong merge and the fix git will reject doing a fast forward merge in that case please put your local 5.6 (and master accordingly) branch aside and reset to upstream, then cherry pick local changes. This might be an approach: $ git checkout PHP-5.6 # Go to your local 5.6 branch $ git pull # Results in error "can't fast-forward" $ git branch backup-5.6 # create a backup $ git reset --hard origin/PHP-5.6 # Overwrite local 5.6 with upstream $ gitk PHP-5.6 backup-5.6 # Investigate changes, cherry pick etc. $ git branch -D backup-5.6 # Remove backup (warning: no # confirmation before deletion, be sure # there's none of your work left!) To prevent this in future: Could somebody look into creating a git hook script for our server which checks main/php_version.h and rejects pushes where version number and branch name won't match? .. or some other clever approach? Thanks, johannes

Attachment: [application/pgp-signature] This is a digitally signed message part signature.asc