[mapserver-dev] 6.4 stable branch gone wild

[thomas bonfort]

Even,
There was no magic involved, all was done manually (there was very
little to be done anyways):
- cherry-picked one commit
- merged one pull-request (4803)

regards,
thomas

On 3 December 2013 13:11, Even Rouault <even.rouault at mines-paris.org> wrote:
> Selon thomas bonfort <thomas.bonfort at gmail.com>:
>
>> I've pushed the changes to the github repository... for anyone that
>> has pulled branch-6-4 since november 20th, the easiest is to delete
>> your working branch-6-4 and start it back from scratch:
>>
>> #move off off the current branch-6-4
>> git checkout master
>> #delete current branch-6-4
>> git branch -d branch-6-4
>> #update our remote
>> git fetch origin #supposing origin is mapserver/mapserver
>> #checkout the updated 6-4 branch
>> git checkout --track origin/branch-6-4
>>
>> catch me on irc if you need help
>
> Hi Thomas,
>
> Would you mind explaining the procedure you followed to recreate the branch with
> the appropriate commits in it (hoping that you didn't need to write down each
> commit sha1 and cherry-pick it...) ? I imagine it could be helpful in case this
> happens to someone else.
>
> Thanks
>
> Even