![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eric Wong <normalperson@yhbt.net> | |
| Sun, 8 Apr 2007 07:59:19 +0000 (00:59 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 9 Apr 2007 02:53:54 +0000 (19:53 -0700) | ||
| commit | 13c823fb520eaf1cded520213cf0ae4c3268208d | |
| tree | 41699dbb63214bddadd0bb25948b93a940997fbd | tree | snapshot |
| parent | 512b620bd9fef7f170562ecad835e37479f051ce | commit | diff |
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
When patches are merged from another git-svn managed branch,
they will have the git-svn-id: metadata line in them (generated
by git-format-patch).
When doing rebase or dcommit via git-svn, this would cause
git-svn to find the wrong upstream branch. We now verify
that the commit is consistent with the value in the .rev_db
file.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
When patches are merged from another git-svn managed branch,
they will have the git-svn-id: metadata line in them (generated
by git-format-patch).
When doing rebase or dcommit via git-svn, this would cause
git-svn to find the wrong upstream branch. We now verify
that the commit is consistent with the value in the .rev_db
file.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-svn.perl | diff | blob | history |