[mapserver-dev] 6.4 stable branch gone wild

[thomas bonfort]

Well, I should have looked into my own mess rather than point fingers
erroneously, and would like to humbly apologize about that. After
another few hours of going through the commits and wondering how/what
happened, `git reflog` showed me that when I was updating my checkout
for applying https://github.com/mapserver/mapserver/pull/4805, I made
a typo and pulled origin/master instead of origin/branch-6-4 into my
local 6-4 branch, effectively merging master into 6.4. Given I had
just previously backported the 6.4 fixes into master (by merging
branch-6-4 into master), the erroneous pull effectively just
fast-forwarded branch-6-4 to be the same as master (i.e. I don't have
a commit I can revert).
While it is easy to revert back to the 6.4 branch as it should be, I
can't see how I can do that without rewriting the history, which would
affect people who have pulled the 6.4 branch since november 20th.
(From the network graph, this would mean Paul, Karl and myself (cc'd))
I'll leave this here for one day in case someone comes up with a
better solution, and if not will apply that change, and followup with
instructions for Paul, Karl and any other people who will have to
update their repository for the rewritten history.

Sorry folks,
thomas

On 30 November 2013 18:07, Lime, Steve D (MNIT) <Steve.Lime at state.mn.us> wrote:
> Seems like option 1 is the most straight forward IMHO... Wish I understood how this happened.
>
> Steve
>
> ________________________________________
> From: mapserver-dev-bounces at lists.osgeo.org [mapserver-dev-bounces at lists.osgeo.org] on behalf of Even Rouault [even.rouault at mines-paris.org]
> Sent: Thursday, November 28, 2013 7:52 AM
> To: mapserver-dev at lists.osgeo.org
> Subject: Re: [mapserver-dev] 6.4 stable branch gone wild
>
> Thomas,
>
> I'm far from being a git expert, but I can see 2 options:
>
> * "git revert -m 1 a9eb0c5081" : this will create a revert commit for the
> merge commit and should undo all unwanted changes. The drawback is that the
> history of the branch will look messy.
>
> * "git reset --hard d5f0aee829f9fef52a3d92a993baf2eac98e919a" to reset to the
> last commit before the merge commit. But I don't think you can push that
> directly into branch-6-4. So branch-6-4 should likely be deleted on the server
> first before that being pushed (or git push --force ?). Drawback: this has the
> potential to cause issues for people who have forked the mapserver git
> repository when they'll pull/push next.
>
> Some interesting info there :
> https://htcondor-wiki.cs.wisc.edu/index.cgi/wiki?p=RevertingBadMerges
>
>> Hi Devs,
>>
>> There's been a mixup made when merging a pull request, which has
>> resulted in the master branch being merged into our stable 6.4 branch
>> (i.e. both our 6.4 and master branches are now quasi identical, which
>> is not ok).
>> I'm at loss as to how to revert this change cleanly without rewriting
>> the history of branch-6-4, can anyone help? It would seem that
>> 75f548e77e1 was merged into 6.4 in a9eb0c5081 instead of being
>> cherrypicked, thus bringing in the whole master branch instead of only
>> the fix to mapfile.c.
>>
>> regards,
>> thomas
>> _______________________________________________
>> mapserver-dev mailing list
>> mapserver-dev at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/mapserver-dev
>
> --
> Geospatial professional services
> http://even.rouault.free.fr/services.html
> _______________________________________________
> mapserver-dev mailing list
> mapserver-dev at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/mapserver-dev
>
>
> _______________________________________________
> mapserver-dev mailing list
> mapserver-dev at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/mapserver-dev