[Kde-pim] [Git migration] Options

Torgny Nyblom kde at nyblom.org
Sat Mar 27 12:18:00 GMT 2010


Hi,

Current status for the rules:
kdepimlibs - pretty close to done (see issues below).
kdepim - Waiting for the issues.
kdepim-runtime - Waiting for the issues.

Issues:
Currently I've been unable to find a way to get git to follow history correct 
when a sub directory has been moved across a module border and has been 
renamed at the same time, for instance kdepim/akonadi/libakonadi -> 
kdepimlibs/akonadi at r788342. The history is there but git cannot follow the 
current HEAD backwards across the border.

One solution to this would be to import each sub directory into its own git 
repository and then join all these into a module repository, however this will 
have the consequence of ignoring any directory renames that the sub directory 
might have had, in other words it will break old builds since code might be in 
the wrong directory.

Another  solution is to ignore this apparent loss of history, but that will 
break git blame and friends.

Other solutions?

/Regards
Torgny
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/



More information about the kde-pim mailing list