On Wed, Mar 31, 2010 at 11:39 AM, Peter Baumann <waste.manager@xxxxxx> wrote: > On Wed, Mar 31, 2010 at 06:33:09AM -0500, David Hagood wrote: > The problems where no bidirectional mapping exists are the following: > > - CC is file based, where as GIT is tree (the whole repository) based > > - This leads to problems where you merge a file on differen CC branches, > because in GIT a merge is only on the whole tree, so at least this > information is lost. (see cleartool lstree for a file with merges) Of course, you can do such file-by-file merges in CVS and SVN as well, and importing into git seems to work okay. What doesn't get tracked is the actual merge history of the merged files. This isn't such a problem when importing CVS and SVN, which mostly don't track merge history anyway :) Have fun, Avery -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html