(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[DQ [LIT_CHARS "recursive merge corner cases w/ renames but not criss-crosses"]]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/delete + untracked file">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo \"A pretty inscription\" >ring &&\n"> <LIT_CHARS "\tgit add ring &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m beginning &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch people &&\n"> <LIT_CHARS "\tgit checkout -b rename-the-ring &&\n"> <LIT_CHARS "\tgit mv ring one-ring-to-rule-them-all &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m fullname &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout people &&\n"> <LIT_CHARS "\tgit rm ring &&\n"> <LIT_CHARS "\techo gollum >owner &&\n"> <LIT_CHARS "\tgit add owner &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m track-people-instead-of-objects &&\n"> <LIT_CHARS "\techo \"Myyy PRECIOUSSS\" >ring\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "Does git preserve Gollum's precious artifact?"]]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive rename-the-ring &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Make sure git did not delete an untracked file\n"> <LIT_CHARS "\ttest -f ring\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/modify/add-source 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 \"1\\n2\\n3\\n4\\n5\\n6\\n7\\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 "\techo 8 >>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\techo something completely different >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "rename/modify/add-source conflict resolvable">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive C^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse B:a) = $(git rev-parse b) &&\n"> <LIT_CHARS "\ttest $(git rev-parse C:a) = $(git rev-parse a)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup resolvable conflict missed if rename missed">]} {[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 \"1\\n2\\n3\\n4\\n5\\n\" >a &&\n"> <LIT_CHARS "\techo foo >b &&\n"> <LIT_CHARS "\tgit add a b &&\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 c &&\n"> <LIT_CHARS "\techo \"Completely different content\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\techo 6 >>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "conflict caused if rename not detected">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -q C^0 &&\n"> <LIT_CHARS "\tgit merge -s recursive B^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_line_count = 6 c &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:b) = $(git rev-parse A:b)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup conflict resolved wrong if rename missed">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b D A &&\n"> <LIT_CHARS "\techo 7 >>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit mv a c &&\n"> <LIT_CHARS "\techo \"Completely different content\" >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m D &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b E A &&\n"> <LIT_CHARS "\tgit rm a &&\n"> <LIT_CHARS "\techo \"Completely different content\" >>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m E\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "missed conflict if rename not detected">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -q E^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive D^0\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup undetected rename/add-source causes data loss">]} {[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 \"1\\n2\\n3\\n4\\n5\\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 b &&\n"> <LIT_CHARS "\techo foobar >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "detect rename/add-source and preserve all data">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive C^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 "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f a &&\n"> <LIT_CHARS "\ttest -f b &&\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:a) = $(git rev-parse C:a)\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "detect rename/add-source and preserve all data, merge other way">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive B^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 "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f a &&\n"> <LIT_CHARS "\ttest -f b &&\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:a) = $(git rev-parse C:a)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup content merge + rename/directory 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 \"1\\n2\\n3\\n4\\n5\\n6\\n\" >file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\tgit tag base &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b right &&\n"> <LIT_CHARS "\techo 7 >>file &&\n"> <LIT_CHARS "\tmkdir newfile &&\n"> <LIT_CHARS "\techo junk >newfile/realfile &&\n"> <LIT_CHARS "\tgit add file newfile/realfile &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m right &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b left-conflict base &&\n"> <LIT_CHARS "\techo 8 >>file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\tgit mv file newfile &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m left &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b left-clean base &&\n"> <LIT_CHARS "\techo 0 >newfile &&\n"> <LIT_CHARS "\tcat file >>newfile &&\n"> <LIT_CHARS "\tgit add newfile &&\n"> <LIT_CHARS "\tgit rm file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m left\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rename/directory conflict + clean content merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout left-clean^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive right^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 1 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo 0 >expect &&\n"> <LIT_CHARS "\tgit cat-file -p base:file >>expect &&\n"> <LIT_CHARS "\techo 7 >>expect &&\n"> <LIT_CHARS "\ttest_cmp expect newfile~HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :2:newfile) = $(git hash-object expect) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f newfile/realfile &&\n"> <LIT_CHARS "\ttest -f newfile~HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rename/directory conflict + content merge conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout left-conflict^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive right^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 "\tgit cat-file -p left-conflict:newfile >left &&\n"> <LIT_CHARS "\tgit cat-file -p base:file    >base &&\n"> <LIT_CHARS "\tgit cat-file -p right:file   >right &&\n"> <LIT_CHARS "\ttest_must_fail git merge-file \\\n"> <LIT_CHARS "\t\t-L \"HEAD:newfile\" \\\n"> <LIT_CHARS "\t\t-L \"\" \\\n"> <LIT_CHARS "\t\t-L \"right^0:file\" \\\n"> <LIT_CHARS "\t\tleft base right &&\n"> <LIT_CHARS "\ttest_cmp left newfile~HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f newfile/realfile &&\n"> <LIT_CHARS "\ttest -f newfile~HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup content merge + rename/directory conflict w/ disappearing dir">]} {[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 "\tmkdir sub &&\n"> <LIT_CHARS "\tprintf \"1\\n2\\n3\\n4\\n5\\n6\\n\" >sub/file &&\n"> <LIT_CHARS "\tgit add sub/file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\tgit tag base &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b right &&\n"> <LIT_CHARS "\techo 7 >>sub/file &&\n"> <LIT_CHARS "\tgit add sub/file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m right &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b left base &&\n"> <LIT_CHARS "\techo 0 >newfile &&\n"> <LIT_CHARS "\tcat sub/file >>newfile &&\n"> <LIT_CHARS "\tgit rm sub/file &&\n"> <LIT_CHARS "\tmv newfile sub &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m left\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "disappearing dir in rename/directory conflict handled">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout left^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge -s recursive right^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 "\techo 0 >expect &&\n"> <LIT_CHARS "\tgit cat-file -p base:sub/file >>expect &&\n"> <LIT_CHARS "\techo 7 >>expect &&\n"> <LIT_CHARS "\ttest_cmp expect sub &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f sub\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/rename (2to1) + 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 \"1\\n2\\n3\\n4\\n5\\n\" >a &&\n"> <LIT_CHARS "\tprintf \"5\\n4\\n3\\n2\\n1\\n\" >b &&\n"> <LIT_CHARS "\tgit add a b &&\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 c &&\n"> <LIT_CHARS "\techo 0 >>b &&\n"> <LIT_CHARS "\tgit add b &&\n"> <LIT_CHARS "\tgit commit -m B &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv b c &&\n"> <LIT_CHARS "\techo 6 >>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "handle rename/rename (2to1) conflict correctly">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive C^0 >out &&\n"> <LIT_CHARS "\ttest_i18ngrep \"CONFLICT (rename/rename)\" out &&\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 "\ttest 2 -eq $(git ls-files -u c | wc -l) &&\n"> <LIT_CHARS "\ttest 3 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest ! -f a &&\n"> <LIT_CHARS "\ttest ! -f b &&\n"> <LIT_CHARS "\ttest -f c~HEAD &&\n"> <LIT_CHARS "\ttest -f c~C^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git hash-object c~HEAD) = $(git rev-parse C:a) &&\n"> <LIT_CHARS "\ttest $(git hash-object c~C^0) = $(git rev-parse B:b)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup simple rename/rename (1to2) 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 "\techo stuff >a &&\n"> <LIT_CHARS "\tgit add a &&\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 checkout -b B A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\ttest_tick &&\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 "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge has correct working tree contents">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 3 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 3 -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 :1:a) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:b) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:c) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest ! -f a &&\n"> <LIT_CHARS "\ttest $(git hash-object b) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git hash-object c) = $(git rev-parse A:a)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/rename(1to2)/add-source 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 \"1\\n2\\n3\\n4\\n5\\n6\\n7\\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 "\techo something completely different >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\tgit commit -m C\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "detect conflict with rename/rename(1to2)/add-source merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive C^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 0 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse 3:a) = $(git rev-parse C:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse 1:a) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse 2:b) = $(git rev-parse B:b) &&\n"> <LIT_CHARS "\ttest $(git rev-parse 3:c) = $(git rev-parse C:c) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f a &&\n"> <LIT_CHARS "\ttest -f b &&\n"> <LIT_CHARS "\ttest -f c\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/rename(1to2)/add-source resolvable 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>a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m base &&\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 "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m one &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a b &&\n"> <LIT_CHARS "\techo important-info >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m two\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "rename/rename/add-source still tracks new a file">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\tgit merge -s recursive B^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 -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD:b) = $(git rev-parse A:a)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup rename/rename(1to2)/add-dest 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 "\techo stuff >a &&\n"> <LIT_CHARS "\tgit add a &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m base &&\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 precious-data >c &&\n"> <LIT_CHARS "\tgit add c &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m one &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b C A &&\n"> <LIT_CHARS "\tgit mv a c &&\n"> <LIT_CHARS "\techo important-info >b &&\n"> <LIT_CHARS "\tgit add b &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m two\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rename/rename/add-dest merge still knows about conflicting file versions">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout C^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s recursive B^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 5 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -u b | wc -l) &&\n"> <LIT_CHARS "\ttest 2 -eq $(git ls-files -u c | wc -l) &&\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse :1:a) = $(git rev-parse A:a) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:b) = $(git rev-parse C:b) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:b) = $(git rev-parse B:b) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :2:c) = $(git rev-parse C:c) &&\n"> <LIT_CHARS "\ttest $(git rev-parse :3:c) = $(git rev-parse B:c) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git hash-object c~HEAD) = $(git rev-parse C:c) &&\n"> <LIT_CHARS "\ttest $(git hash-object c~B\\^0) = $(git rev-parse B:c) &&\n"> <LIT_CHARS "\ttest $(git hash-object b~HEAD) = $(git rev-parse C:b) &&\n"> <LIT_CHARS "\ttest $(git hash-object b~B\\^0) = $(git rev-parse B:b) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest ! -f b &&\n"> <LIT_CHARS "\ttest ! -f c\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)