<br><br>On Thursday, November 3, 2011, Andreas Hocevar <<a href="mailto:ahocevar@opengeo.org">ahocevar@opengeo.org</a>> wrote:<br>> Hi,<br>><br>> I just tried to bring the svn repository up to date with the git one, but this ended up as one big commit. Do we care? If so, I apologize. git dcommit --dry-run did not output anything suspicious, so I went for the real thing.<br>
><br>> Here is what I did:<br>><br>> git clone git@github.com:openlayers/openlayers.git openlayers-git-svn<br>> cd openlayers-git-svn<br>> git svn init --trunk=trunk/openlayers <a href="http://svn.openlayers.org">http://svn.openlayers.org</a><br>
> git checkout 8bcbb069b56c3a810a94c55224e726a13d3096a2<br>> git rebase --onto remotes/trunk --root master<br>> git fetch origin master<br>> git merge -Xtheirs FETCH_HEAD<br>> git svn dcommit --add-author-from --use-log-author --username openlayersgit<br>
><br>> The "git checkout 8bcbb069b56c3a810a94c55224e726a13d3096a2" was supposed to set git to the last commit in svn (r12414).<br>><br>> The dcommit created a merge commit which I pushed to <a href="https://github.com/ahocevar/openlayers/commit/ad44399a2210adf34e2e378a42b382ee2f0b8a34">https://github.com/ahocevar/openlayers/commit/ad44399a2210adf34e2e378a42b382ee2f0b8a34</a> for posterity. The last revision on master that *should* have ended up in svn was 0bf1169c1695571660ccc6a1c41b781769d641eb<br>
><br>> Please let me know if you're unhappy with what I have done, and I'll try to fix it. Otherwise I'll just leave it as is, and I volunteer to change the cron job that updates the examples and docs on the OpenLayers website to build directly from git instead of the svn mirror.<br>
<br>Thanks Andreas for taking a look at this. I actually don't see much value in maintaining this mirror now. github has good SVN support, so people using SVN only should still feel home. And modifying our infrastructure-related scripts to use github svn instead of osgeo svn should be straightforward.<br>
<br>Cheers,<br><br>-- <br>Eric Lemoine<br><br>Camptocamp France SAS<br>Savoie Technolac, BP 352<br>73377 Le Bourget du Lac, Cedex<br><br>Tel : 00 33 4 79 44 44 96<br>Mail : <a href="mailto:eric.lemoine@camptocamp.com">eric.lemoine@camptocamp.com</a><br>
<a href="http://www.camptocamp.com">http://www.camptocamp.com</a><br><br>