[Kde-scm-interest] Re: svn2git problem: kalgebra history broken, again

[Torgny Nyblom]

On Sat, 25 Dec 2010 20:24:02 +0100
Niko Sams <niko.sams at gmail.com> wrote:

Hi,

> the kdeedu/kalgebra history stops at the kdereview -> kdeedu move with
> the latest svn2git version.
> There was a small window where it worked:
> 1eacf0f983ef27e8795460b9dc5973f2fb063864 fixed it
> 409d8bc4cbaade82672f251c45178c3cfed4619d broke it again (3 commits later)
> 
> to reproduce use this command (with the attached rule file):
> svn-all-fast-export --identity-map=../kde-ruleset/account-map
> --add-metadata --rules=../kde-ruleset/kalgebra-test
> --resume-from=670354 --max-rev=670592 ../svn
> Correct behavior: 2 items in history (r670354 and r670592)
> Wrong behavior: 1 item in history (r670592)
> (see the rule file for some information on the relevant svn commits)
> 
> please have a look at the problem,
> thanks
> Niko
> 
> 
> ======
> svn-all-fast-export output:
> Exporting revision 670400     /trunk/KDE/kdeedu/doc/kalgebra was
> copied from /trunk/kdereview/doc/kalgebra rev 670393
>     /trunk/KDE/kdeedu/kalgebra was copied from
> /trunk/kdereview/kalgebra rev 670393
> ./trunk/KDE/kdeedu/kalgebra/ rev 670400 is reseating branch master to
> an earlier revision /trunk/kdereview/kalgebra/ rev 670393
> Creating branch: "master" from "master" ( 670393 "from branch master
> at r670393 => r670354" )
> WARN: backing up branch "master" to "refs/backups/r670400/heads/master"
>  0 modifications from SVN /trunk/KDE/kdeedu/kalgebra/ to kalgebra/master done
> 
> ======
> gitlog output:
> progress SVN r670400 branch master = :2
> 
> reset refs/heads/master
> from 0000000000000000000000000000000000000000
> 
> progress SVN r670406 branch master = :0 # delete
> 
> reset refs/backups/r670406/heads/master
> from refs/heads/master
> 
> SVN_SILENT made messages (.desktop file)
> 
> svn path=/trunk/KDE/kdeedu/kalgebra/; revision=670592
> 
> M 100644 :1048575 src/kalgebra.desktop
> 
> create repository kalgebra
> end repository
> 
> match /trunk/playground/edu/kalgebra/
>   repository kalgebra
>   branch master
> end match
> 
> match /trunk/kdereview/kalgebra/
>   repository kalgebra
>   branch master
> end match
> 
> match /trunk/KDE/kdeedu/kalgebra/
>   repository kalgebra
>   branch master
> end match
> 
> 
> match /
> end match
> 
> 
> # r670592 (SVN_SILENT made messages (.desktop file))
> # r670400 /trunk/kdereview/kalgebra:670393 -> /trunk/KDE/kdeedu/kalgebra (Moving KAlgebra from kdereview to kdeedu!)

No: this is a svn cp not svn mv.
r670406 svn rm /trunk/kdereview/kalgebra
^^^^^^^^^^^
This is the culprit, here you match the entire master branch and it is deleted just as the kdereview branch was in svn.
You need to ignore this revision.

> # r670354 (SVN_SILENT made messages (.desktop file))
> 
> # r662628 (tsdgeos is right, we need it to be translated)
> # r662611 /trunk/playground/edu/kalgebra -> /trunk/kdereview/kalgebra

This was a proper svn mv, so here it's ok to delete the master branch as it is recreated in the same commit from an earlier version.

> # r662391 (FIX. Some visualisation issues with completer)
> 
> # r635430 (Here we have the first addition of KAlgebra into...)


/Regards
Torgny