Re: Fixed wrong merge (force push) (Re: [PHP-CVS] del php-src: .gdbinit .gitattributes .gitignore .travis.yml CODING_STANDARDS EXTENSIONS INSTALL
LICENSE Makefile.frag Makefile.gcov Makefile.global NEWS README.EXTENSIONS README.PARAMETER_PARSING_API README.PHP4-TO-PHP5-THIN-CHANGES
README.RELEASE_PROCESS README.STREAMS README.SUBMITTING_PATCH README.md TSRM/Makefile.am TSRM/TSRM.dsp TSRM/config.w32 TSRM/tsrm_virtual_cwd.c
TSRM/tsrm_virtual_cwd.h TSRM/tsrm_win32.c UPGRADING UPGRADING.INTERNALS Ze)
| From: | Laruence | Date: | Sun, 17 Nov 2013 14:51:49 +0000 |
| Subject: | Re: Fixed wrong merge (force push) (Re: [PHP-CVS] del php-src: .gdbinit .gitattributes .gitignore .travis.yml CODING_STANDARDS EXTENSIONS INSTALL LICENSE Makefile.frag Makefile.gcov Makefile.global NEWS README.EXTENSIONS README.PARAMETER_PARSING_API README.PHP4-TO-PHP5-THIN-CHANGES README.RELEASE_PROCESS README.STREAMS README.SUBMITTING_PATCH README.md TSRM/Makefile.am TSRM/TSRM.dsp TSRM/config.w32 TSRM/tsrm_virtual_cwd.c TSRM/tsrm_virtual_cwd.h TSRM/tsrm_win32.c UPGRADING UPGRADING.INTERNALS Ze) |
||
| References: | 1 2 | Groups: | php.cvs php.internals |
| Request: | Send a blank email to internals+get-70177@lists.php.net to get a copy of this message | ||
Hey:
thanks for correcting this :)
thanks
On Sun, Nov 17, 2013 at 8:44 PM, Johannes Schlüter <johannes@php.net> wrote:
> Hi,
>
> quick heads up:
>
> By accident the 5.6 branch was merged into 5.4. This was fixed by force
> pushing the last "proper" 5.4 revision on that branch.
>
>
> The broken branch is being backed up here:
> https://github.com/johannes/php-src/tree/broken-5.4-20131117
>
> The revision used for resetting the branch is
> 823e330c75a7ed87dcdcd692f8672420c1abe244.
>
> In case you *pushed* to the 5.4 branch within the last 4 hours please
> verify your commits are still there. (I hope 823e330 was the latest but
> better double check)
>
> 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.4
> branch aside and reset to upstream, then cherry pick local changes.
>
> This might be an approach:
>
> $ git checkout PHP-5.4 # Go to your local 5.4 branch
> $ git pull # Results in error "can't fast-forward"
> $ git branch backup-5.4 # create a backup
> $ git reset --hard origin/PHP-5.4
> # Overwrite local 5.4 with upstream
> $ gitk PHP-5.4 backup-5.4 # Investigate changes, cherry pick etc.
> $ git branch -D backup-5.4 # 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?
>
> If there are questions/issues: I'll observe #php.pecl on efnet for a
> while.
>
> johannes
>
>
> On Sun, 2013-11-17 at 12:11 +0000, Johannes Schlüter wrote:
>> Branch: PHP-5.4
>> Deleted commits count: 6235
>> User: Johannes Schlüter <johannes@php.net> Sun, 17 Nov 2013 12:11:05 +0000
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
Laruence Xinchen Hui
http://www.laruence.com/