asterixdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [IMPORTANT] Git issues
Date Tue, 14 Jul 2015 02:53:23 GMT
On Mon, Jul 13, 2015 at 10:15 PM, Ian Maxon <imaxon@uci.edu> wrote:
> After careful consideration, and some experimentation, this is the
> best plan as I see it:
>
> The last commit we have in ASF master right now
> (c66d23a5ac65ec5218ee47134aea423fd62a32cc) is not one that we wish to
> keep. It's basically the correct commit content-wise, but the message
> and hence hash are wrong and needlessly conflict with Gerrit's proper
> version (900bf1345410264e9b48469da93ccbd831920d2e). Resolving the
> issue by rewinding or restoring Gerrit from backup would involve both
> rewriting history on Gerrit's master branch by rewinding it and
> cherry-picking commits onto it, and ugly surgery to Gerrit's internal
> database. Therefore a force push to ASF git to overwrite the incorrect
> commit, with the correct commit that currently resides in Gerrit's
> master, is likely the least painful option.
>
> The only complicating fact of course, is if anyone has pulled c66d23a5
> to their master branch, or merged it into any feature branches. For
> the former case, just performing a git reset --HARD to master once the
> force-update is performed should suffice. For the latter case, some
> less simple git-fu will probably be in order (checking out to last
> common ancestor, then re-merging would likely be simplest).
>
> I'm open to thoughts/suggestions/objections. Rewriting history in git
> is not something to be taken lightly, so I want to be sure everyone's
> in agreement and aware of what's going to happen.
>


ASF master branch does not allow force pushes, and rewriting history
won't be permitted. The ASF repo is the canonical repository for the
project.

--David

Mime
View raw message