You can use Grafts as a method for linking between the two repos to give the appearance that the history is continuous [apparently it was used for adding the early Linux history]. This does not change any of the sha1 values so their use in validating the complete history won't be valid. Also propogating the graft list must also be managed. Think of it as a temporary but effective step.
You can do a git filter-branch after the graft, but this then re-writes the history (sha1's) but with an active repo that can cause hassles if you don't synchronise the change-over date/time with everybody. There are a number of threads on Stackoverflow on the issue. Philip ----- Original Message ----- From: To: git-users@googlegroups.com Sent: Thursday, June 28, 2012 6:57 PM Subject: [git-users] how to merge to separate repositories. Hi, a few years ago, we switched from using CVS to git. Since at the time I didn't know about git cvsimport (I was just beginning to use git), I checked out the most recent version from CVS and made that the initial commit of our git repository. This unfortunately meant that we lost all history prior to the switch. We would now like to add that missing history into git. I converted the CVS to git and have two git repositories now, one that is the converted CVS, and one that contains all changes since then. How do I merge the two? Naively this shouldn't be hard, I simply would have to glue together the two histories, since there is no overlap. But how do I do that? Thanks already, nick -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/ZAzOwJctktUJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. No virus found in this message. Checked by AVG - www.avg.com Version: 2012.0.2180 / Virus Database: 2437/5096 - Release Date: 06/27/12 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
