On Wed, Jan 15, 2014 at 5:29 PM, Justin Deoliveira <
[email protected]> wrote:
>
>> Yep, with it I've managed to create a branch that can be fetched, and
>> then recovered master state.
>> Now onto 2.4.x and 2.3.x
>>
>> Can you clarify what this means for those of us who haven't pull down
> anything yet? Will the next update be a simple "git pull origin master"?
> Will any of the history on the branch change?
>
Just finished restoring 2.4.x, 2.3.x and 2.2.x
Hopefully, nothing special will happen for you, here is the process I've
used to restore the branches:
1) create a branch that can be fetched from the commit id previous to
Alessio's changes (from the event api output), e.g.:
> aaime@hydra:/tmp$ cat 22x-recover.json
{
"ref": "refs/heads/22x-recover",
"sha": "dc09fb111ac7f956cf275d17db40a5a3eecf7cf4"
}
> curl --user "user:password" "
https://api.github.com/repos/geoserver/geoserver/git/refs"; -d
@22x-recover.json -XPOST
2) git fetch geoserver
3) git checkout 2.2.x
3) git reset --hard dc09fb111ac7f956cf275d17db40a5a3eecf7cf4 (which is now
possible because the fetch above retrieved this commit again)
4) git push geoserver 2.2.x
So, in the end, I've just used a normal push to apply back the commits, and
the commit ids haven't changed.
My hope is that this will be transparent, but let me know if it's not
Cheers
Andrea
--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==
Ing. Andrea Aime
@geowolf
Technical Lead
GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549
http://www.geo-solutions.it
http://twitter.com/geosolutions_it
-------------------------------------------------------
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Geoserver-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
