{"thread":{"id":"8471","subject":"merging two repositories","startedAt":"2007-06-06T14:56:49Z","lastAt":"2007-06-06T18:01:09Z","messageCount":2,"participants":["joel reed","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"44165","messageId":"4666CB31.9070007@gmail.com","threadId":"8471","inReplyTo":null,"subject":"merging two repositories","fromName":"joel reed","fromEmail":"joelwreed@gmail.com","sentAt":"2007-06-06T14:56:49Z","receivedAt":"2007-06-06T14:56:49Z","isPatch":false,"sender":{"key":"joelwreed@gmail.com","avatar":null},"body":"I've been maintaining a project in git for a while and making use of \nhttp://repo.or.cz/w/tfs.git as a public repository. Since I also needed \na project site, I set something up at Google Code, which of course, \nforces you to use subversion.\n\nI added the files to subversion, checked them in, then a few weeks later \ndecided I should learn how to use git-svn. So now I have two trees, one \npure git using repo.or.cz, and the other made by git-svn against Google' \nsubversion.\n\nIs there anyway to merge these two repositories into one? I don't want \nto lose the http://repo.or.cz/w/tfs.git history, but I don't care about \nthe Google subversion history.\n\nI tried moving the .git/svn folder from the git-svn managed repository \ninto the repo.or.cz .git folder, but as I expected, that didn't work. \nLife's never that easy! Anyway, if anyone knows how to merge these two \nrepos, I would love to hear about it.\n\njr\n\nPS. Maybe, a more generalized use case here is\n  a) maintain a git tree for a while\n  b) decide you have to stick code in subversion for others sometime \nlater, but you still want to use git and keep your git history\n"},{"id":"44176","messageId":"Pine.LNX.4.64.0706061859520.4046@racer.site","threadId":"8471","inReplyTo":"4666CB31.9070007@gmail.com","subject":"Re: merging two repositories","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-06-06T18:01:09Z","receivedAt":"2007-06-06T18:01:09Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 6 Jun 2007, joel reed wrote:\n\n> So now I have two trees, one pure git using repo.or.cz, and the other \n> made by git-svn against Google' subversion.\n\nI'd merge them by fetching the pure-git one into the git-svn'ed. Or vice \nversa. Then, you can say \"git merge <other-branch>\". If the revisions are \nsimiliar (or identical), it will succeed even if they do not have any \ncommon ancestor.\n\nCiao,\nDscho\n"}]}