Revision 1d144aa25edbb4dcda88abbaef8f336108b8d788 authored by Sam Vilain on 19 December 2009, 16:20:30 UTC, committed by Eric Wong on 21 December 2009, 10:32:46 UTC
As shown, git-svn has some problems; not all svn merges are correctly
detected, and cherry picks may incorrectly be detected as real merges.
These test cases will be marked as _success once the relevant fixes are in.

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
1 parent af57b41
History
File Mode Size
xdiff.h -rw-r--r-- 3.1 KB
xdiffi.c -rw-r--r-- 14.6 KB
xdiffi.h -rw-r--r-- 1.8 KB
xemit.c -rw-r--r-- 5.1 KB
xemit.h -rw-r--r-- 1.2 KB
xinclude.h -rw-r--r-- 1.2 KB
xmacros.h -rw-r--r-- 1.9 KB
xmerge.c -rw-r--r-- 14.3 KB
xpatience.c -rw-r--r-- 10.7 KB
xprepare.c -rw-r--r-- 11.2 KB
xprepare.h -rw-r--r-- 1.1 KB
xtypes.h -rw-r--r-- 1.6 KB
xutils.c -rw-r--r-- 8.1 KB
xutils.h -rw-r--r-- 1.7 KB

back to top