[Kde-scm-interest] svn2git 209e6ce can corrupt history

Thiago Macieira thiago at kde.org
Sat Aug 7 20:38:28 CEST 2010


On Saturday 7. August 2010 14.50.00 Torgny Nyblom wrote:
>   On 2010-08-03 11:24, Pauli Virtanen wrote:
> > Hi all,
> > 
> > I noticed that svn2git (from http://gitorius.org/svn2git) commit
> > 
> >          209e6ce Try and branch from the correct svn revision rather then
> >          the last one.
> > 
> > can cause corrupt trees to appear in the repository history.
> > 
> > It occurs with this repository: http://svn.scipy.org/svn/numpy
> > (svn dump here, if you want to play with it:
> > http://pav.iki.fi/tmp/numpy.svndump.gz)
> 
> [...]
> 
> > For some reason, the tree corresponding to tag 1.0.3.1 is different in
> > the generated Git repository than what it is in SVN. The branch point
> > seems to be detected wrong, and for some reason this also affects the
> > content of the corresponding revision. Perhaps there are also other
> > discrepancies, but this I managed to spot.
> > 
> > With 209e6ce I see this behavior, but it works correctly with 209e6ce^
> > so the bug seems to be in 209e6ce.
> 
> There seems to something wrong with the svndump.
> 
> svn log -v -c 3972 file:///code/numpy/svnrepo/
> ------------------------------------------------------------------------
> r3972 | jarrod.millman | 2007-08-18 20:30:41 +0200 (lör, 18 aug 2007) |
> 2 lines
> Changed paths:
>     A /tags/1.0.3.1 (from /branches/1.0.3.x:3971)
> 
> Tag tree for 1.0.3.1 release
> 
> ------------------------------------------------------------------------
> 
> svn log -v -c 3971 file:///code/numpy/svnrepo/
> ------------------------------------------------------------------------
> r3971 | cookedm | 2007-08-17 20:32:01 +0200 (fre, 17 aug 2007) | 2 lines
> Changed paths:
>     M /trunk/numpy/distutils/exec_command.py
> 
> exec_command.py: remove a version check for > Python 2.1
> 
> ------------------------------------------------------------------------
> 
> According to this the 1.0.3.1 tag was created from branch 1.0.3.x but
> from a commit that only touches trunk.

There's nothing wrong with that. You can copy a path in any revision: it's 
simply the state in which that path was in that revision, as affected by the 
latest commit before that revision at that path.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20100807/05a4679a/attachment.sig 


More information about the Kde-scm-interest mailing list