[Kde-scm-interest] Re: Tracking moves without losing history

[Torgny Nyblom]

Hi,

On Sun, 12 Dec 2010 15:49:26 +0100
Niko Sams <niko.sams at gmail.com> wrote:

> I have problems with losing all history when a repository got moved.
> (1) First (correctly working) example is the move of marble from
> playground to kdereview:
>     662514 (.. and moving the docs into the right place ...)
> playground -> kdereview: 662511 (Moving Marble into kdereview - yay!)
>     662505 (add a CMakeList.txt)
> this is detected correctly, rev 662514 and 662505 show up as commits,
> 662511 not.
> 
> (2) However the move from kdereview to kdeedu breaks the history:
>     669526 (ChangeLog)
> kderveview -> kdeedu: 669496 (Moving Marble into KDE-Edu after
> receiving green light from annma)
>     669486 (Some fixes:)
> History starts with 669496, all former commits are lost.

What does the debug log (stdout) and gitlog say for there revisions?

> What I have found out is that the difference between those is that in
> (1) svn_fs_paths_changed reports
> first the delete first and the add second, while for (2) it is the
> other way around.
> But how to solve the problem?
> Please, someone with more knowledge about svn2git, take a look at it :D

Order has no effect for svn2git cause it always writes deletes before modifications to git.

> To reproduce use this rule file:
> create repository KDE/kdeedu/marble
> end repository
> 
> match /trunk/playground/base/(marble)/
>   repository KDE/kdeedu/\1
>   branch master
> end match

This should trigger a deletion of master at r662511

> match /trunk/kdereview/(marble)/
>   repository KDE/kdeedu/\1
>   branch master
> end match

And this for r669496

/Regards
Torgny