From kde-pim Mon Apr 05 12:11:34 2010 From: "David Jarvie" Date: Mon, 05 Apr 2010 12:11:34 +0000 To: kde-pim Subject: Re: [Kde-pim] [Git migration] Options Message-Id: X-MARC-Message: https://marc.info/?l=kde-pim&m=127046953101159 On Sat, March 27, 2010 8:31 pm, Thomas McGuire wrote: >> 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. > > I don't understand anything about svn2git, so I can't give an answer to > this. Isn't there some way to fix this? Maybe ask on scm-interest. > >> Another solution is to ignore this apparent loss of history, but that >> will break git blame and friends. > > I suppose if there really is no way to convert the history, we can manage > to live without out, but I prefer to have it there. Wouldn't it be better to retain the history, in preference to retaining subdirectory renames? If people want to rebuild old versions, they can always use snapshots rather then retrieving from git. -- David Jarvie. KDE developer. KAlarm author - http://www.astrojar.org.uk/kalarm _______________________________________________ KDE PIM mailing list kde-pim@kde.org https://mail.kde.org/mailman/listinfo/kde-pim KDE PIM home page at http://pim.kde.org/