[Kde-pim] Re: KDEPIM Git Move

Torgny Nyblom kde at nyblom.org
Sat Nov 6 12:42:07 GMT 2010


On Friday 05 November 2010 14.14.36 Torgny Nyblom wrote:
> On Friday 05 November 2010 13.04.06 Torgny Nyblom wrote:
> [...]
> 
> > One open issue:
> Well two :)
> 
> There are two options for how the conversion should be done:
> 
> * "Flat" history, This is the way that all rules use so far except the pim
> 	ones in certain versions.
> 	Pro: "git log" will be accurate.
> 	Pro: Easier to verify since git log will be able to follow history.
> 	Con: Old revisions will be different from what they acctually were as all
> 			files will be named as they are in HEAD. ie revisions prior to the
> 			migration will be unbuildable (well not exactly the migration point
> 			but when the first move/copy occured).
> 	Con: Merges will be hidden, ie shown as changes.
> 
> *"As is" history. This would meen trying to stay as close to the actual
> 	history in SVN as it was at any given revision.
> 	Pro: History will be more correct.
> 	Pro: Merges will be marked as merges not changes.
> 	Con: "git log" will be unable to follow history corectlly, however "git gui
> blame" will be correct.
> 	Con: Harder to verify history as git log will not be able to follow history
> in all cases.
> 	Con: Repository size will be slightly bigger and contain more partial
> 		 branches (might be hidden)

Also come to think of it there is a third option:
Simply ignore any history a file has spent outside the module. I guess this 
will be fine with long lived apps like kmail but not for new ones like the 
akonadi suite.

/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