Hi all, Since at this time, the commits usually still happen on branches of http://svn.secondlife.com/svn/linden/ (or are snapshotted there from LL's internal subversion repository) and are only later merged over to the mercurial repositories at http://bitbucket.org/lindenlab/, I wondered if I could keep my clone of http://bitbucket.org/lindenlab/http-texture/ up to date by pulling changes from http://svn.secondlife.com/svn/linden/projects/2009/http-texture/.
To do so, I executed > hg -v convert http://svn.secondlife.com/svn/linden/projects/2009/http-texture > http-texture where ./http-texture contained a clone of http://bitbucket.org/lindenlab/http-texture/. This took quite long to finish. (In previous tries where I didn't use the -v option, I killed the process, because I thought it had crashed.) Fortunately, mercurial remembers what SVN revisions it already has for subsequent calls of hg convert. (Unfortunately, this info doesn't seem to get passed on when cloning.) What worries me now, is that this process not only created another head, but that the newly imported revisions don't seem to have common ancestors with the ones that were already in it. I've pushed the result to http://bitbucket.org/boroondas/snowglobe-svn2hg_test/. Note that http://bitbucket.org/boroondas/snowglobe-svn2hg_test/changeset/fc8054fad4b0/ doesn't have a parent. This problem didn't appear when I tested what would happen when merging two hg repositories that I had created independently of each other by converting the same SVN repo at different revisions. (Then again, that repository had much simpler content and history than LL's) Any ideas of what I could do differently? Also, what are the short-term plans (if any) for the repositories at http://bitbucket.org/lindenlab/? I guess they'll co-exist with LL's internal and public subversion repositories for quite some while, so will syncing between corresponding branches be automated during the transition? cheers Boroondas _______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/SLDev Please read the policies before posting to keep unmoderated posting privileges
