merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 70c52c1f9754934f1f868f998f3c007696799787..565365cbd3ff80d816dd02b2072045cd25ae4b93 100755 (executable)
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -105,4 +105,38 @@ test_expect_success 'empty directories in trunk exist' '
        )
 '
 
+test_expect_success 'remove a top-level directory from svn' '
+       svn_cmd rm -m "remove d" "$svnrepo"/d
+'
+
+test_expect_success 'removed top-level directory does not exist' '
+       git svn clone "$svnrepo" removed &&
+       test ! -e removed/d
+
+'
+unhandled=.git/svn/refs/remotes/git-svn/unhandled.log
+test_expect_success 'git svn gc-ed files work' '
+       (
+               cd removed &&
+               git svn gc &&
+               : Compress::Zlib may not be available &&
+               if test -f "$unhandled".gz
+               then
+                       svn_cmd mkdir -m gz "$svnrepo"/gz &&
+                       git reset --hard $(git rev-list HEAD | tail -1) &&
+                       git svn rebase &&
+                       test -f "$unhandled".gz &&
+                       test -f "$unhandled" &&
+                       for i in a b c "weird file name" gz "! !"
+                       do
+                               if ! test -d "$i"
+                               then
+                                       echo >&2 "$i does not exist"
+                                       exit 1
+                               fi
+                       done
+               fi
+       )
+'
+
 test_done