| commit | 1cef6500a9edc7997bd0aa4cd1f739f5106ab0a9 | |
| author | Andrew Myrick <amyrick@apple.com> | |
| Thu, 7 Jan 2010 00:25:21 +0000 (6 16:25 -0800) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Sat, 23 Jan 2010 11:23:03 +0000 (23 03:23 -0800) | ||
| tree | aa6c6d0c3dbffead7fbd6c0ce1e273645d69599c | treesnapshot (tar.gz zip) |
| parent | aba7dea83bfba411dee0271491d6199d2dca61d9 | commitdiff |
git-svn: ignore changeless commits when checking for a cherry-pick
Update git-svn to ignore commits that do not change the tree when it is
deciding if an svn merge ticket represents a real branch merge or just a
cherry-pick.
Consider the following integration model in the svn repository:
F---G branch1
/ \
D tag1 \ E tag2
/ \ /
A---B C trunk
branch1 is merged to trunk in commit C.
With this patch, git-svn will correctly identify branch1 as a proper merge
parent, instead of incorrectly ignoring it as a cherry-pick.
Signed-off-by: Andrew Myrick <amyrick@apple.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Update git-svn to ignore commits that do not change the tree when it is
deciding if an svn merge ticket represents a real branch merge or just a
cherry-pick.
Consider the following integration model in the svn repository:
F---G branch1
/ \
D tag1 \ E tag2
/ \ /
A---B C trunk
branch1 is merged to trunk in commit C.
With this patch, git-svn will correctly identify branch1 as a proper merge
parent, instead of incorrectly ignoring it as a cherry-pick.
Signed-off-by: Andrew Myrick <amyrick@apple.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| git-svn.perl | diffblobblamehistory |