Hello everybody,
I've done the procedure suggested by Michael up to this point, not included :
# after this point, Leo has to re-do his merge between
tip(4d510ca732d3) and b54276b85632. I only provide the following
commands as a guess:
$ hg merge -r b54276b85632
...
There is now two rep. at hg.globulation2.org :
glob2-old, the original one, please do not commit in it
glob2-new, the fixed one.
I've added back write access, but before committing, please wait for Leo and
Kieran to put back their changes and check if everything is back on track.
Have a nice day,
Steph
--
http://stephane.magnenat.net
_______________________________________________
glob2-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/glob2-devel
