summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorLibravatar Tuomas Suutari <tuomas.suutari@gmail.com>2010-02-22 09:57:21 +0200
committerLibravatar Eric Wong <normalperson@yhbt.net>2010-02-26 01:30:23 -0800
commit9560808f2ef5a34d2a69c454cfa6003a2f8467cb (patch)
tree6e8b75b6af40b8e5b8643bab54d26a4517685369 /sha1_name.c
parentt9151: Fix a few commits in the SVN dump (diff)
downloadtgif-9560808f2ef5a34d2a69c454cfa6003a2f8467cb.tar.xz
t9151: Add two new svn:mergeinfo test cases
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>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions