(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "recursive merge corner cases involving criss-cross merges">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (FunctionDef get_clean_checkout []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS git]} {[LIT_CHARS reset]} {[LIT_CHARS --hard]})
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS clean]} {[LIT_CHARS -fdqx]})
        (Com {[LIT_CHARS git]} {[LIT_CHARS checkout]} {[DQ [VarSub 1]]})
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup basic criss-cross + rename with no modifications">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tten=\"0 1 2 3 4 5 6 7 8 9\" &&\n"> <LIT_CHARS "\tfor i in $ten\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\techo line $i in a sample file\n"> <LIT_CHARS "\tdone >one &&\n"> <LIT_CHARS "\tfor i in $ten\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\techo line $i in another sample file\n"> <LIT_CHARS "\tdone >two &&\n"> <LIT_CHARS "\tgit add one two &&\n"> <LIT_CHARS "\ttest_tick && git commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch L1 &&\n"> <LIT_CHARS "\tgit checkout -b R1 &&\n"> <LIT_CHARS "\tgit mv one three &&\n"> <LIT_CHARS "\ttest_tick && git commit -m R1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout L1 &&\n"> <LIT_CHARS "\tgit mv two three &&\n"> <LIT_CHARS "\ttest_tick && git commit -m L1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout L1^0 &&\n"> <LIT_CHARS "\ttest_tick && git merge -s ours R1 &&\n"> <LIT_CHARS "\tgit tag L2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout R1^0 &&\n"> <LIT_CHARS "\ttest_tick && git merge -s ours L1 &&\n"> <LIT_CHARS "\tgit tag R2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge simple rename+criss-cross with no modifications">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout L2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive R2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :2:three) = $(git rev-parse L2:three) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:three) = $(git rev-parse R2:three) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&\n"> <LIT_CHARS "\ttest $(git rev-parse R2:three) = $(git hash-object three~R2^0)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup criss-cross + rename merges with basic modification">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tten=\"0 1 2 3 4 5 6 7 8 9\" &&\n"> <LIT_CHARS "\tfor i in $ten\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\techo line $i in a sample file\n"> <LIT_CHARS "\tdone >one &&\n"> <LIT_CHARS "\tfor i in $ten\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\techo line $i in another sample file\n"> <LIT_CHARS "\tdone >two &&\n"> <LIT_CHARS "\tgit add one two &&\n"> <LIT_CHARS "\ttest_tick && git commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch L1 &&\n"> <LIT_CHARS "\tgit checkout -b R1 &&\n"> <LIT_CHARS "\tgit mv one three &&\n"> <LIT_CHARS "\techo more >>two &&\n"> <LIT_CHARS "\tgit add two &&\n"> <LIT_CHARS "\ttest_tick && git commit -m R1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout L1 &&\n"> <LIT_CHARS "\tgit mv two three &&\n"> <LIT_CHARS "\ttest_tick && git commit -m L1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout L1^0 &&\n"> <LIT_CHARS "\ttest_tick && git merge -s ours R1 &&\n"> <LIT_CHARS "\tgit tag L2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout R1^0 &&\n"> <LIT_CHARS "\ttest_tick && git merge -s ours L1 &&\n"> <LIT_CHARS "\tgit tag R2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge criss-cross + rename merges with basic modification">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout L2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive R2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 2 = $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :2:three) = $(git rev-parse L2:three) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:three) = $(git rev-parse R2:three) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&\n"> <LIT_CHARS "\ttest $(git rev-parse R2:three) = $(git hash-object three~R2^0)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup differently handled merges of rename/add conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"0\\n1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick && git commit -m A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch B &&\n"> <LIT_CHARS "\tgit checkout -b C &&\n"> <LIT_CHARS "\techo 10 >>a &&\n"> <LIT_CHARS "\techo \"other content\" >>new_a &&\n"> <LIT_CHARS "\tgit add a new_a &&\n"> <LIT_CHARS "\ttest_tick && git commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\tgit mv a new_a &&\n"> <LIT_CHARS "\ttest_tick && git commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge C &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\ttest_tick && git commit -m D &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge B &&\n"> <LIT_CHARS "\trm new_a~HEAD new_a &&\n"> <LIT_CHARS "\tprintf \"Incorrectly merged content\" >>new_a &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\ttest_tick && git commit -m E &&\n"> <LIT_CHARS "\tgit tag E\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git detects differently handled merges conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 3 = $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 3 = $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 = $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit cat-file -p B:new_a >>merged &&\n"> <LIT_CHARS "\tgit cat-file -p C:new_a >>merge-me &&\n"> <LIT_CHARS "\t>empty &&\n"> <LIT_CHARS "\ttest_must_fail git merge-file \\\n"> <LIT_CHARS "\t\t-L \"Temporary merge branch 2\" \\\n"> <LIT_CHARS "\t\t-L \"\" \\\n"> <LIT_CHARS "\t\t-L \"Temporary merge branch 1\" \\\n"> <LIT_CHARS "\t\tmerged empty merge-me &&\n"> <LIT_CHARS "\tsed -e \"s/^\\([<=>]\\)/\\1\\1\\1/\" merged >merged-internal &&\n"> <LIT_CHARS "\ttest $(git rev-parse :1:new_a) = $(git hash-object merged-internal)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup criss-cross + modify/delete resolved differently">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo A >file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch B &&\n"> <LIT_CHARS "\tgit checkout -b C &&\n"> <LIT_CHARS "\tgit rm file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\techo B >file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge C &&\n"> <LIT_CHARS "\techo B >file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m D &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge B &&\n"> <LIT_CHARS "\tgit rm file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m E &&\n"> <LIT_CHARS "\tgit tag E\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git detects conflict merging criss-cross+modify/delete">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :1:file) = $(git rev-parse master:file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:file) = $(git rev-parse B:file)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git detects conflict merging criss-cross+modify/delete, reverse direction">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :1:file) = $(git rev-parse master:file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:file) = $(git rev-parse B:file)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup differently handled merges of directory/file conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t>ignore-me &&\n"> <LIT_CHARS "\tgit add ignore-me &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m A &&\n"> <LIT_CHARS "\tgit tag A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch B &&\n"> <LIT_CHARS "\tgit checkout -b C &&\n"> <LIT_CHARS "\tmkdir a &&\n"> <LIT_CHARS "\techo 10 >a/file &&\n"> <LIT_CHARS "\tgit add a/file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\techo 5 >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge C &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\trm -rf a/ &&\n"> <LIT_CHARS "\techo 5 >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m D &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge B &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tgit rm --cached a &&\n"> <LIT_CHARS "\techo 10 >a/file &&\n"> <LIT_CHARS "\tgit add a/file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m E1 &&\n"> <LIT_CHARS "\tgit tag E1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge B &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tgit rm --cached a &&\n"> <LIT_CHARS "\tprintf \"10\\n11\\n\" >a/file &&\n"> <LIT_CHARS "\tgit add a/file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m E2 &&\n"> <LIT_CHARS "\tgit tag E2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge of D & E1 fails but has appropriate contents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tget_clean_checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive E1^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:a) = $(git rev-parse B:a)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge of E1 & D fails but has appropriate contents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tget_clean_checkout E1^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:a) = $(git rev-parse B:a)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge of D & E2 fails but has appropriate contents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tget_clean_checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive E2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 3 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :2:a) = $(git rev-parse B:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f a~HEAD\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge of E2 & D fails but has appropriate contents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tget_clean_checkout E2^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 3 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :3:a) = $(git rev-parse B:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f a~D^0\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"1\\n2\\n3\\n4\\n5\\n6\\n\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m A &&\n"> <LIT_CHARS "\tgit tag A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b B A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\techo 7 >>b &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a c &&\n"> <LIT_CHARS "\tgit commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -q B^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours C^0 &&\n"> <LIT_CHARS "\tgit mv b newname &&\n"> <LIT_CHARS "\tgit commit -m \"Merge commit C^0 into HEAD\" &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -q C^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours B^0 &&\n"> <LIT_CHARS "\tgit mv c newname &&\n"> <LIT_CHARS "\tprintf \"7\\n8\\n\" >>newname &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\tgit commit -m \"Merge commit B^0 into HEAD\" &&\n"> <LIT_CHARS "\tgit tag E\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup criss-cross + rename/rename/add + modify/modify">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"lots\\nof\\nwords\\nand\\ncontent\\n\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m A &&\n"> <LIT_CHARS "\tgit tag A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b B A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a c &&\n"> <LIT_CHARS "\tprintf \"2\\n3\\n4\\n5\\n6\\n7\\n\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours C^0 &&\n"> <LIT_CHARS "\tgit checkout C -- a c &&\n"> <LIT_CHARS "\tmv a old_a &&\n"> <LIT_CHARS "\techo 1 >a &&\n"> <LIT_CHARS "\tcat old_a >>a &&\n"> <LIT_CHARS "\trm old_a &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\tgit commit -m \"Merge commit C^0 into HEAD\" &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours B^0 &&\n"> <LIT_CHARS "\tgit checkout B -- b &&\n"> <LIT_CHARS "\techo 8 >>a &&\n"> <LIT_CHARS "\tgit add -u &&\n"> <LIT_CHARS "\tgit commit -m \"Merge commit B^0 into HEAD\" &&\n"> <LIT_CHARS "\tgit tag E\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "detect rename/rename/add-source for virtual merge-base">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 3 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:c) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest \"$(cat a)\" = \"$(printf \"1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n\")\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup criss-cross+rename/rename/add-dest + simple modify">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\trm -rf .git &&\n"> <LIT_CHARS "\tgit init &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m A &&\n"> <LIT_CHARS "\tgit tag A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b B A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\tprintf \"1\\n2\\n3\\n4\\n5\\n6\\n7\\n\" >c &&\n"> <LIT_CHARS "\tgit add c &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a c &&\n"> <LIT_CHARS "\tgit commit -m C &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours C^0 &&\n"> <LIT_CHARS "\tgit mv b a &&\n"> <LIT_CHARS "\tgit commit -m \"D is like B but renames b back to a\" &&\n"> <LIT_CHARS "\tgit tag D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\tgit merge --no-commit -s ours C^0 &&\n"> <LIT_CHARS "\tgit mv b a &&\n"> <LIT_CHARS "\techo 8 >>c &&\n"> <LIT_CHARS "\tgit add c &&\n"> <LIT_CHARS "\tgit commit -m \"E like D but has mod in c\" &&\n"> <LIT_CHARS "\tgit tag E\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "virtual merge base handles rename/rename(1to2)/add-dest">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout D^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive E^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:c) = $(git rev-parse E:c)\n">]})
  (Com {[LIT_CHARS test_done]})
)