On Tue, Feb 19, 2013 at 02:03:36PM -0800, Peter Hosey wrote: > On Feb 19, 2013, at 13:59:24, Thijs Alkemade wrote: > > So I think it's ready for the world to try, so now go fork it and send some > > pull requests everyone. :) > > If we're keeping the Mercurial repository as our master repository, have > you/has anyone verified that changesets make it back from Git to Mercurial > correctly (and don't subsequently get re-converted from Mercurial to Git, > causing duplicates or other weirdness)? >
Yeah, I did http://hg.adium.im/adium/rev/2808f202d2ef with the Github website itself. After that I did http://hg.adium.im/adium/rev/5268b37fad0d locally in hg, and pushed both. Pushing the hg one to Github fails of course, as both are on master (and merging shouldn't be tried automatically, I think). But pulling the commit from Github into mercurial worked fine. I merged it locally into http://hg.adium.im/adium/rev/63097a96adad, pushed to hg.adium.im and after that everything pushed to Github properly again. Thijs
pgpyxBJ9H_Yif.pgp
Description: PGP signature
