You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@polygene.apache.org by Niclas Hedhman <ni...@hedhman.org> on 2015/04/24 08:56:31 UTC
[HELP] Merge Error
Git Masters,
Two problems;
1) I made the mistake of merging 'Updating_deprecated_methods_in_ASM' to
'master', and pushed that before I realized the mistake.
Can anyone figure out what needs to be done to restore 'master'??
2) I missed to move the TAGS from the Qi4j repository to the Zest
repository. Can this be done now??
Sorry for the mess.
Cheers
--
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java
Re: [HELP] Merge Error
Posted by Niclas Hedhman <ni...@hedhman.org>.
Problem 2) --> Solved.
On Fri, Apr 24, 2015 at 2:56 PM, Niclas Hedhman <ni...@hedhman.org> wrote:
> Git Masters,
>
> Two problems;
>
> 1) I made the mistake of merging 'Updating_deprecated_methods_in_ASM' to
> 'master', and pushed that before I realized the mistake.
>
> Can anyone figure out what needs to be done to restore 'master'??
>
> 2) I missed to move the TAGS from the Qi4j repository to the Zest
> repository. Can this be done now??
>
> Sorry for the mess.
>
> Cheers
> --
> Niclas Hedhman, Software Developer
> http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java
>
--
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java
Re: [HELP] Merge Error
Posted by Niclas Hedhman <ni...@hedhman.org>.
I am fine with a temporary unstable 'master'.
On Fri, Apr 24, 2015 at 6:05 PM, Paul Merlin <pa...@nosphere.org> wrote:
> Niclas Hedhman a écrit :
> > And I tried to remove 'master', but that is also not allowed.
> :)
>
> > One choice is to ignore the problem and it is auto-fixed at 2.1 release,
> > which we want to do soon anyway.
> That would be the easier path, only drawback being that until 2.1 the
> master branch is not 'stable' as advertised.
>
> > Another is to not consider 'master' the stable one, but create a new
> branch
> > (such as 'latest' or 'releases') and change the docs for that.
> Yes but we can't remove master, so what about it?
>
> > So, yeah... Not sure what is the the better choice here.
> I'd lean towards ignoring the problem and focusing on 2.1 as our first
> Apache release.
>
> WDYT?
>
> /Paul
>
>
--
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java
Re: [HELP] Merge Error
Posted by Paul Merlin <pa...@nosphere.org>.
Niclas Hedhman a écrit :
> And I tried to remove 'master', but that is also not allowed.
:)
> One choice is to ignore the problem and it is auto-fixed at 2.1 release,
> which we want to do soon anyway.
That would be the easier path, only drawback being that until 2.1 the
master branch is not 'stable' as advertised.
> Another is to not consider 'master' the stable one, but create a new branch
> (such as 'latest' or 'releases') and change the docs for that.
Yes but we can't remove master, so what about it?
> So, yeah... Not sure what is the the better choice here.
I'd lean towards ignoring the problem and focusing on 2.1 as our first
Apache release.
WDYT?
/Paul
Re: [HELP] Merge Error
Posted by Niclas Hedhman <ni...@hedhman.org>.
And I tried to remove 'master', but that is also not allowed.
One choice is to ignore the problem and it is auto-fixed at 2.1 release,
which we want to do soon anyway.
Another is to not consider 'master' the stable one, but create a new branch
(such as 'latest' or 'releases') and change the docs for that.
So, yeah... Not sure what is the the better choice here.
// Niclas
On Fri, Apr 24, 2015 at 3:45 PM, Paul Merlin <pa...@nosphere.org> wrote:
> Niclas,
>
> > I made the mistake of merging 'Updating_deprecated_methods_in_ASM' to
> > 'master', and pushed that before I realized the mistake.
> >
> > Can anyone figure out what needs to be done to restore 'master'??
> I took a quick look.
>
> One could do, on up-to-date master:
>
> # Reset the master head to the 2.0 release commit
> git reset --hard a675e78c56d9a317af6079ef696b94c070faeabb
> # Force-push the master branch
> git push origin master -f
>
> But, looks like this is forbidden by a pre-receive hook at Apache's git.
> Which is fair. Don't rewrite history. Maybe there's a Apache way to
> solve this?
>
> Without rewriting history, we need to add a commit to the master branch
> that revert its state to the 2.0 release, which is 236 commits back
> (please double check this number).
>
> One could do it that way :
>
> # See git revert --help
> git revert HEAD~236..HEAD --no-edit --no-commit
> git add .
> git commit -m "Commit message for big revert commit"
>
> At the end of the day the master branch would contain the 236? spurious
> commits plus one commit reverting all of them. The 2.0 tag would be left
> behind, where it belongs.
>
> What should we do?
>
> /Paul
>
>
--
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java
Re: [HELP] Merge Error
Posted by Paul Merlin <pa...@nosphere.org>.
Niclas,
> I made the mistake of merging 'Updating_deprecated_methods_in_ASM' to
> 'master', and pushed that before I realized the mistake.
>
> Can anyone figure out what needs to be done to restore 'master'??
I took a quick look.
One could do, on up-to-date master:
# Reset the master head to the 2.0 release commit
git reset --hard a675e78c56d9a317af6079ef696b94c070faeabb
# Force-push the master branch
git push origin master -f
But, looks like this is forbidden by a pre-receive hook at Apache's git.
Which is fair. Don't rewrite history. Maybe there's a Apache way to
solve this?
Without rewriting history, we need to add a commit to the master branch
that revert its state to the 2.0 release, which is 236 commits back
(please double check this number).
One could do it that way :
# See git revert --help
git revert HEAD~236..HEAD --no-edit --no-commit
git add .
git commit -m "Commit message for big revert commit"
At the end of the day the master branch would contain the 236? spurious
commits plus one commit reverting all of them. The 2.0 tag would be left
behind, where it belongs.
What should we do?
/Paul