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?
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:
The first commit in in *git-commits* thereby has the parent commit
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
*git-commits* and the git-svn commit it was based on.
Another possibility is to try some of the options
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
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at