Hi Gerrit, Gerrit Voß wrote: > On Tue, 2010-02-23 at 23:17 -0600, Carsten Neumann wrote: >> I could not figure out how to migrate git svn to a different repository >> location > > there is some not so intuitive magic involved. When I switched the > my main development tree I followed > > http://theadmin.org/articles/2008/09/30/git-svn-switch-to-a-different-a-svn-url/ > > and that worked fine. Not sure if that works in your case as I only had > problems during dcommits. Fetching actually went fine. But than I > usually pull or rebase. I nearly never merge.
thanks for the link, I had done a quick search at the time but must have missed this one. It's a complete mystery to me what this sequence of commands actually does, but if they work that is not such a big deal ;) > I also had more problems when a recent internal svn changed servers. > In this case I would get a complete second tree in the same repository > as I tried to update the remote svn head. IIRC in this case only > reapplying the changes from one tree to the other worked. But as they > sat in the same git repository this worked well. yeah, that is the situation I encountered, I got a full second tree and in my case moving changes did not work, they just resulted in conflicts :( >> [SNIP] >> Do you think this is going to be a problem? Any ideas? Sorry, hope I did >> not mess things up too badly... > > The good thing with git is you can always force it back into shape. > This is something I would prefer to do. The svn head should always > be relatable to the svn repository. Ok, I'll push a second svn head > to the sandbox, do a complete checkout and see where pulling in from > the svn repo leaves us. hm, I guess a first step to undo the damage is to do a git reset --hard "before bad commits" on my OpenSGSandbox.git clone's osg-svn-head branch and git push --force [email protected]:vossg/OpenSGSandbox.git osg-svn-head:osg-svn-head ? If I understand it correctly that would basically put things back into a state before my mistake, right? Thanks, Carsten ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Opensg-core mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensg-core
