mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
9560808f2e
When svn:mergeinfo contains two new parents in a specific order and
one is ancestor of the other, it is possible that git-svn discards the
wrong one. The first test case ("commit made to merged branch is
reachable from the merge") proves this.
The second test case ("merging two branches in one commit is detected
correctly") is just for completeness, since there was no test for
merging two (feature) branches to trunk in one commit.
Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
|
||
|---|---|---|
| .. | ||
| .gitignore | ||
| make-svnmerge-dump | ||
| svn-mergeinfo.dump | ||