git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 512b620)
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
authorEric Wong <redacted>
Sun, 8 Apr 2007 07:59:19 +0000 (00:59 -0700)
committerJunio C Hamano <redacted>
Mon, 9 Apr 2007 02:53:54 +0000 (19:53 -0700)
commit13c823fb520eaf1cded520213cf0ae4c3268208d
tree41699dbb63214bddadd0bb25948b93a940997fbdtree | snapshot
parent512b620bd9fef7f170562ecad835e37479f051cecommit | 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-svn.perl diff | blob | history
git clone https://git.99rst.org/PROJECT