On 2017-06-04 23:12, Bo Berglund wrote:
Why is the repo in this condition? And what to do about it? Obviously going over it with git reset HEAD <file>... isn't really practical since this example project (an Android App) contains deeply nested folder trees with hundreds of files.
Like I said, I have no experience with CVS or covertions from CVS-to-Git. 1) I suggest you start with a 'gitk --all' and see how the history of your repository looks like, and if there is any history at all. 2) You don't have to reset each file one by one. You can do it all in one go with: git reset --hard But why all your files are marked for deletion is a mystery to me. 3) This is never mentioned in ANY repository conversion guides, but something I ALWAYS do. After you ran your automated migration to Git, I would use a comparison tool (eg: Beyond Compare) and compare a _clean_ original repository against the newly migrated Git repository. Do a new checkout of the original repository (CVS, Subversion etc) to make sure it is clean and you know it is the latest code from the server. Technically there should be NO differences, but on the small chance that there is, now is the time to see the differences and commit those into Git so you know going forward both repositories have the exact same state (at the time of migration). Regards, Graeme -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://fpgui.sourceforge.net/ My public PGP key: http://tinyurl.com/graeme-pgp _______________________________________________ fpc-other maillist - fpc-other@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-other
