Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:118177
Date: Mon, 4 Jul 2022 11:07:52 +0100 (BST)
To: "Christoph M. Becker" <cmbecker69@gmx.de>
cc: Remi Collet <remi@php.net>, PHP internals <internals@lists.php.net>
In-Reply-To: <4b3a2ac2-c580-405e-fdc0-51e1ca1fb480@gmx.de>
Message-ID: <alpine.DEB.2.23.453.2207041104260.44432@singlemalt.home.derickrethans.nl>
References: <f9ce69e2-88cb-12f3-74a6-a6ed753555cf@php.net> <4b3a2ac2-c580-405e-fdc0-51e1ca1fb480@gmx.de>
User-Agent: Alpine 2.23 (DEB 453 2020-06-18)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Subject: Re: [PHP-DEV] Re: PHP-8.1 branch seems broken
From: derick@php.net (Derick Rethans)

On Mon, 4 Jul 2022, Christoph M. Becker wrote:

> On 04.07.2022 at 10:16, Remi Collet wrote:
> 
> > In PHP 8.1:
> >
> > This branch is 1 commit ahead, 7 commits behind master.
> >
> >
> > This seems terribly wrong, looks like was merged from master
> > (NEWS file have 8.2 entries)
> >
> >
> > Can some GIT expert check and fix that ?
> 
> Derick is working on fixing the issue.  Since he will need to reset to
> the last good state, and force-push, everybody will have to fix their
> clones afterwards (reset and pull).  Please do not push to any branch
> until this is done.

Thanks to Tim we've rebuild the PHP-8.1 branch. You will only have to 
reset the PHP-8.1 branch, with the following:

	git fetch
	git checkout PHP-8.1
	# Backup local changes
	git reset --hard origin/PHP-8.1
	# Reapply local changes

Before you push anything, please make sure that the graph looks good, 
preferably by using the "gitk" tool to visualise.

cheers,
Derick