"Phil Holmes" <m...@philholmes.net> writes:
> ----- Original Message -----
> From: "David Kastrup" <d...@gnu.org>
> To: "Phil Holmes" <m...@philholmes.net>
>
>> I consider it a bad idea to have those changes in a release without
>> having them in master. I think what you want to do here is to back out
>> those changes again since they were required as a consequence of issue
>> 4550 which has been reverted. You should be able to do this using
>>
>> git checkout release/unstable
>> git reset --hard 314336b
>>
>> and then start over with
>>
>> git merge origin/master
>> git cherry-pick c3eeea3dd # This is the release news
>>
>> --
>> David Kastrup
>
>
> What I was planning on doing and have now tried, was to reset
> release/unstable back to Dan's commit
> 59a6d1a06432fc0ca88c3023c646182f389ec1b5 and then repeat the merge of
> origin/master and the edits to VERSION and news, and then push this
> back to release/unstable.
>
> This is rejected with a note that it will lose history and therefore
> can't be fast-forwarded. I presume the history that will be lost were
> the attempts to fix the GUB compile?
Yup.
> If so, I presume I should force the push? If so, could you remind me
> of the syntax?
Uh, followup mail to the mail you quoted?
Phil, did you see the following message? I'm asking because
origin/release/unstable still looks like containing the additional
commits not in master. While that does not necessarily mean that your
own release/unstable does, it is somewhat worrisome.
If you have problems _pushing_ your own release/unstable because the
current origin/release/unstable is not a proper ancestor of it, you can
delete origin/release/unstable with
git push origin :refs/heads/release/unstable
and then overwrite with your local release/unstable (assuming that the
_branch_ is where you want it) using
git push origin release/unstable:refs/heads/release/unstable
Executive summary: just do
git push origin :refs/heads/release/unstable
and then repeat whatever push was rejected, but make sure to write the
whole :refs/heads/release/unstable incantation as the target of the push
since Git will not be able to deduce it correctly once you deleted the
branch on the server.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
