On Wednesday, August 22, 2012 3:59:40 PM UTC+2, Clint wrote: > > > There is this svn repository that has been relocated, and merged with > another svn repository. > This means the URL has changed and the revision numbers have been offset. > > I see a few methods while searching online, and the only one that came > close to working was to use "git filter-branch --msg-filter" to modify the > "git-svn-id:" tags. I can get "git svn rebase" working again, but when I > try to merge that into other git branches, I get unexpected conflicts > related to old commits. > Is there any way to get this working again without using msg-filter and > rewriting all these commits? > > Clint >
I think that when you rewrite history (with filter-branch), the repository loses track of the references where you have branched out. Let's say you have a branch "*git-commits*" that you branched out from the hypothetical commit 0e151b8faa7 where you have "git-svn-id: https://svn-old/project/trunk@80621 832c1c66-4827-0410-8465-ccb17913cd09". The first commit in in *git-commits* thereby has the parent commit 0e151b8faa7. When you rewrite the git-svn commits, the parent commit changes from 0e151b8faa7 to something else, and it could be that git-commits branch then loses its parent.. It could be that I'm wrong about this, and filter-branch actually does preserve the parent reference to the rewritten git-svn commit. Please check this. If the parent commit has been lost, you need to manually graft<https://git.wiki.kernel.org/index.php/GraftPoint>together the first commit in *git-commits* and the git-svn commit it was based on. Another possibility is to try some of the options here: https://git.wiki.kernel.org/index.php/GitSvnSwitch#Using_--rewrite-root -- 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/-/xOdieGPVd14J. 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.
