(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "merging when a directory was replaced with a symlink">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "create a commit where dir a/b changed to symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir -p a/b/c a/b-2/c &&\n"> <LIT_CHARS "\t> a/b/c/d &&\n"> <LIT_CHARS "\t> a/b-2/c/d &&\n"> <LIT_CHARS "\t> a/x &&\n"> <LIT_CHARS "\tgit add -A &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\tgit tag start &&\n"> <LIT_CHARS "\trm -rf a/b &&\n"> <LIT_CHARS "\tgit add -A &&\n"> <LIT_CHARS "\ttest_ln_s_add b-2 a/b &&\n"> <LIT_CHARS "\tgit commit -m \"dir to symlink\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "checkout does not clobber untracked symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout HEAD^0 &&\n"> <LIT_CHARS "\tgit reset --hard master &&\n"> <LIT_CHARS "\tgit rm --cached a/b &&\n"> <LIT_CHARS "\tgit commit -m \"untracked symlink remains\" &&\n"> <LIT_CHARS "\ttest_must_fail git checkout start^0\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "a/b-2/c/d is kept when clobbering symlink b">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout HEAD^0 &&\n"> <LIT_CHARS "\tgit reset --hard master &&\n"> <LIT_CHARS "\tgit rm --cached a/b &&\n"> <LIT_CHARS "\tgit commit -m \"untracked symlink remains\" &&\n"> <LIT_CHARS "\tgit checkout -f start^0 &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "checkout should not have deleted a/b-2/c/d">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout HEAD^0 &&\n"> <LIT_CHARS "\tgit reset --hard master &&\n"> <LIT_CHARS "\t git checkout start^0 &&\n"> <LIT_CHARS "\t test -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup for merge test">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d &&\n"> <LIT_CHARS "\techo x > a/x &&\n"> <LIT_CHARS "\tgit add a/x &&\n"> <LIT_CHARS "\tgit commit -m x &&\n"> <LIT_CHARS "\tgit tag baseline\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\tgit merge -s resolve master &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\tgit merge -s recursive master &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout master^0 &&\n"> <LIT_CHARS "\tgit merge -s resolve baseline^0 &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout master^0 &&\n"> <LIT_CHARS "\tgit merge -s recursive baseline^0 &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "do not lose untracked in merge (resolve)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\t>a/b/c/e &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s resolve master &&\n"> <LIT_CHARS "\ttest -f a/b/c/e &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "do not lose untracked in merge (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\t>a/b/c/e &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive master &&\n"> <LIT_CHARS "\ttest -f a/b/c/e &&\n"> <LIT_CHARS "\ttest -f a/b-2/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "do not lose modifications in merge (resolve)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\techo more content >>a/b/c/d &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s resolve master\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "do not lose modifications in merge (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\techo more content >>a/b/c/d &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive master\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup a merge where dir a/b-2 changed to symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout start^0 &&\n"> <LIT_CHARS "\trm -rf a/b-2 &&\n"> <LIT_CHARS "\tgit add -A &&\n"> <LIT_CHARS "\ttest_ln_s_add b a/b-2 &&\n"> <LIT_CHARS "\tgit commit -m \"dir a/b-2 to symlink\" &&\n"> <LIT_CHARS "\tgit tag test2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge should not have D/F conflicts (resolve)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\tgit merge -s resolve test2 &&\n"> <LIT_CHARS "\ttest -f a/b/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b-2 was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b-2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge should not have D/F conflicts (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout baseline^0 &&\n"> <LIT_CHARS "\tgit merge -s recursive test2 &&\n"> <LIT_CHARS "\ttest -f a/b/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b-2 was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b-2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge should not have F/D conflicts (recursive)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -b foo test2 &&\n"> <LIT_CHARS "\tgit merge -s recursive baseline^0 &&\n"> <LIT_CHARS "\ttest -f a/b/c/d\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SYMLINKS]} {[SQ <LIT_CHARS "a/b-2 was resolved as symlink">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -h a/b-2\n">]})
  (Com {[LIT_CHARS test_done]})
)