> > which creates a mercurial repository which is also a svn repo and has > > a nice script hgpullsvn, that works perfectly. Then I use this > > mercurial repo - clone it, work on it, commit etc. on many computers. > > When I want to commit back to svn, I need to go to the first mercurial > > repo, pull all changes from other hg repositories, and then I'll do > > "svn ci" and commit all the changes I did into the svn repository as > > one commit. Works nice. > > Hmm. So now your svn repo can be pushed only from hgsvn one? What will
Yes. > be if you, or another user will commit from another svn checkout? You'll > have to run hgpullsvn in your first working place again, and it will Yes. > probably screw up on your all-changes-at-once commit. Unfortunately I think you are right. I originally thought of this procedure: You will hgpullsvn on the svn && hg repo, let's call it A. I will pull A to my local hg repo B. Merge changes. Push B to A. And "svn ci" at A. If "svn ci" again refuses to commit (meaning someone else has commited in svn), I'll repeate the procedure. So the A is only used as a kind of gateway. For real work I use B. But I am not sure what happens with hgpullsvn, when it pulls the commit I just commited using svn in the repo A. I need to try it, but I think it doesn't necessary has to screw up my changesets, it will simply create a new hg head if something goes wrong. And it may even be that clever that it will only download svn commits that I didn't commit (I actually think this is the case). > The right thing to do is to try hgpushsvn -- it will try to transform > each mercurial commit into appropriate svn commit. When done this way > it is possible to synchronize hgsvn repository from svn again in the > future. That is correct, if we could make hgpushsvn run, this is the ideal solution. Sorry I was busy. I only created this wiki: http://code.google.com/p/sympy/wiki/Mercurial Let's put all the technical information in there. Ondrej --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sympy?hl=en -~----------~----~----~----~------~----~------~--~---
