On 7/19/12 12:16 , Oliver Bock wrote: >> * In both boinc.git and boinccleaned.git, all the history before >> r12316 is duplicated. In some places even 3x or 4x. Some of these >> duplicated chains of commits contain the openssl etc. binary >> libraries. Apart from being a problem in itself, it also makes it >> harder for me to review the history and possibly find other problems. >> http://wstaw.org/m/2012/07/19/plasma-desktopW10725.png > > I'll look into that...
These are obviously remnants from the previous CVS -> SVN migration. Have a look at the very first commits: > http://boinc.berkeley.edu/trac/log/boinc/?action=follow_copy&mode=follow_copy&rev=25&stop_rev=1&limit=100 There are a number of test commits and structure building. Only then follows the CVS -> SVN migration, adding (useless) branches that are supposed to be ignored in the current migration to git. >From your screenshot (in date-order) one can see that those commits are on different branches. It starts with two branches which came into being when trunk (r9) was created and when trunk/boinc (r10) was created. As can be seen on the GitMigration wiki page, I used git-svn with --trunk=trunk/boinc to align the trunk directory structure with the one used for branches and tags (no boinc subdir). However, trunk/boinc didn't exist right at the beginning of the SVN history. That's probably why there are two starting points. To complicate things even further, look for commits like "This commit was manufactured by cvs2svn to create branch *". This mess ends with Rom's cleanup session in 2007 at roughly the revision you mentioned, namely r12371 which constitutes a tag rename: http://boinc.berkeley.edu/trac/changeset/12371/boinc No wonder git-svn has a hard time migrating those. The most important thing is, however, no information is lost. Browsing that part of the history in ancestor-order (instead of date-order) make things much easier. Rom, can you shed some light on the historic details I may have missed? Oliver _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
