Hi Wolfgang, On Fri, Jun 19, 2009 at 2:43 AM, Wolfgang Schnerring<w...@gocept.com> wrote: > Hi there, > > * Sidnei da Silva <sidnei.da.si...@gmail.com> [2009-06-18 14:28]: >> > I'm asking because I noticed that basically all SVN->DVCS conversion >> > tools (hg convert, git-svn, bzr svn-import, svn2bzr, svn-fast-export.py, >> > svn-all-fast-export.cpp) do not convert the history properly, more >> > precisely, history that happened on branches is lost: >> >> Here's some context about this from one of the Bazaar developers, John >> Arbash Meinel. Hopefully that will solve some of your questions? > > Thanks for relaying! > >> I'm not really sure what he means by "edit" and then "merge" without a >> commit inbetween. So I'm assuming there is one. > > Sorry for being overly brief in my description; please find below a > sample shell script to set up a Subversion repository with a project > containing a trunk and a branch. To reproduce the problem I'm > concerned about, do this: > > $ create-repos.sh repos > $ svn log repos/project/trunk/feature.txt > ------------------------------------------------------------------------ > r9 | wosc | 2009-06-18 17:11:46 +0200 (Thu, 18 Jun 2009) | 1 line > > merged feature1 > ------------------------------------------------------------------------ > r8 | wosc | 2009-06-18 17:11:43 +0200 (Thu, 18 Jun 2009) | 1 line > > implemented feature1 > ------------------------------------------------------------------------ > > As you can see, Subversion reports the history of the file that > happenened on the branch (in r8).
Can you show us your 'svn --version'? I suspect what you're seeing is a result of svn 1.5 merge tracking. > After converting the repository, however... > > $ bzr init-repo repos-bzr > $ cd repos-bzr > $ bzr svn-import file://$PWD/../repos > $ bzr log repos/project/trunk/feature.txt > ------------------------------------------------------------ > revno: 3 > svn revno: 9 (on /project/trunk) > committer: wosc > timestamp: Thu 2009-06-18 14:11:46 +0000 > message: > merged feature1 > > ... this history is lost. Not only does it not appear in the log > output, also when looking at bzr visualize it seems like that branch > never existed at all in bzr. (I'm new to bzr, am I missing something > here?) Like John said, it *should* be possible to bring that information over if the svn repository is in 1.5 format and contains informations about merge, but at the moment that (apparently) hasn't been implemented. -- Sidnei da Silva Canonical Ltd. Landscape · Changing the way you manage your systems http://landscape.canonical.com _______________________________________________ Zope-Dev maillist - Zope-Dev@zope.org http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )