[mapserver-dev] 6.4 stable branch gone wild

[Lime, Steve D (MNIT)]

Note that I didn't try to merge that pull request back into the 6.4 branch, at least not intentionally. As far as I know only master was updated. 

Steve
________________________________________
From: mapserver-dev-bounces at lists.osgeo.org [mapserver-dev-bounces at lists.osgeo.org] on behalf of Lime, Steve D (MNIT) [Steve.Lime at state.mn.us]
Sent: Friday, November 29, 2013 8:35 AM
To: thomas bonfort; Even Rouault
Cc: MapServer Dev Mailing List; Daniel Morissette
Subject: Re: [mapserver-dev] 6.4 stable branch gone wild

The msIO_printf pull request merge was done through the github interface, not the command line. Seemed simple enough.

Steve
________________________________________
From: mapserver-dev-bounces at lists.osgeo.org [mapserver-dev-bounces at lists.osgeo.org] on behalf of thomas bonfort [thomas.bonfort at gmail.com]
Sent: Thursday, November 28, 2013 11:40 AM
To: Even Rouault
Cc: MapServer Dev Mailing List; Daniel Morissette
Subject: Re: [mapserver-dev] 6.4 stable branch gone wild

Even, a checkout at b7cb5712b6bcd which is right before that postgis
pull request, contains fontcache.c , i.e. already has master merged.
Daniel, I don't think this happened through the github interface, but
rather through the git command line (Steve, please confirm). My guess
is that there was a "git merge 75f548e77" instead of a "git
cherry-pick 75f548e77" run on the 6.4 branch (75f548e77 at that time
was master plus 1 commit)

On 28 November 2013 18:23, Even Rouault <even.rouault at mines-paris.org> wrote:
> Le jeudi 28 novembre 2013 16:01:40, Daniel Morissette a écrit :
>> This may be a bit off-topic and of no use to help resolve the current
>> situation, but I'm trying to understand and learn from what happened,
>> and  looking at the commits that you refer to on github it is not
>> obvious what happened, they look like simple two-liner merges:
>>
>> https://github.com/mapserver/mapserver/commit/75f548e77e1
>>
>> https://github.com/mapserver/mapserver/commit/a9eb0c5081
>>
>> How can a github illiterate like me avoid making this kind of mistakes
>> by approving what looks like a simple pull request? What should we look
>> at? If this is a RTFMS then please point us (all github newbies) to the
>> light.
>
> Actually,  I had the same question and I don't think that a9eb0c5081 is the
> merge that caused the issue. I now think this is due to
> https://github.com/mapserver/mapserver/commit/b081e9f3b3d968b8c3b720a976e2a432b7295ed3
>
> "git log --graph" shows that this commit results of a very long lasting branch
> (presumably master) being merged into the current branch.
>
>
>
> *   commit b081e9f3b3d968b8c3b720a976e2a432b7295ed3
> |\  Merge: b7cb571 d4d3e22
> | | Author: Paul Ramsey <pramsey at cleverelephant.ca>
> | | Date:   Mon Nov 25 10:21:08 2013 -0800
> | |
> | |     Merge pull request #4803 from tbonfort/force2d
> | |
> | |     PostGIS 2.1 ST_Force_2D is depreciated
> | |
> | * commit d4d3e2205eeadd3f4b2ad60d803aa7c1836d8dee
> | | Author: Thomas Bonfort <thomas.bonfort at gmail.com>
> | | Date:   Tue Nov 5 10:04:49 2013 +0100
> | |
> | |     use version specific postgis force2d function (#4803)
> | |
> | |     also adds a PROCESSING "FORCE2D=no" to avoid using force2d altogether
> (#4024)
> | |
> | * commit 3a6fa42289cad3596ccb2437167d7de5b0265f75
> | | Author: Thomas Bonfort <thomas.bonfort at gmail.com>
> | | Date:   Tue Nov 5 09:27:31 2013 +0100
> | |
> | |     use st_force2d instead of deprecated st_force_2d (#4803)
> | |
> * | commit b7cb5712b6bcdb23b2aa8214207bfd2feff50465
> | | Author: George Chang <github at gchang.com>
> | | Date:   Wed Nov 6 12:39:48 2013 -0800
> | |
> | |     Allows floating point NoData/NULLVALUEs for floating point images.
> | |
> * |   commit 624940251f6dad286f6bc6033497527a298c02b9
> |\ \  Merge: a9eb0c5 bdaf0cc
> | | | Author: Thomas Bonfort <thomas.bonfort at gmail.com>
> | | | Date:   Wed Nov 20 14:59:03 2013 +0100
> | | |
> | | |     Merge branch 'branch-6-4'
> | | |
> | | |     Conflicts:
> | | |           maputil.c
> | | |           msautotest
>
>
> The "gitk" gui also shows that.
>
> But I'm surprised not to see an explicit "Merge master into branch-6-4" commit
> somewhere...
>
>
>>
>> Thanks
>>
>> Daniel
>>
>> On 13-11-28 8:11 AM, thomas bonfort wrote:
>> > 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

_______________________________________________
mapserver-dev mailing list
mapserver-dev at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapserver-dev