Collect merge-related tests to t64xx

The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity.  Some notes:

t60[234]*.sh:
  Merge tests started in t602*, overgrew bisect and remote tracking
  tests in t6030, t6040, and t6041, and nearly overtook replace tests
  in t6050.  This made picking out relevant tests that I wanted to run
  in a tighter loop slightly more annoying for years.

t303*.sh:
  These started out as tests for the 'merge-recursive' toplevel command,
  but did not restrict to that and had lots of overlap with the
  underlying merge machinery.
t7405, t7613:
  submodule-specific merge logic started out in submodule.c but was
  moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
  submodule merging to merge-recursive.c", 2018-05-15).  Since these
  tests are about the logic found in the merge machinery, moving these
  tests to be with the merge tests makes sense.

t7607, t7609:
  Having tests spread all over the place makes it more likely that
  additional tests related to a certain piece of logic grow in all those
  other places.  Much like t303*.sh, these two tests were about the
  underlying merge machinery rather than outer levels.

Tests that were NOT moved:

t76[01]*.sh:
  Other than the four tests mentioned above, the remaining tests in
  t76[01]*.sh are related to non-recursive merge strategies, parameter
  parsing, and other stuff associated with the highlevel builtin/merge.c
  rather than the recursive merge machinery.

t3[45]*.sh:
  The rebase testcases in t34*.sh also test the merge logic pretty
  heavily; sometimes changes I make only trigger failures in the rebase
  tests.  The rebase tests are already nicely coupled together, though,
  and I didn't want to mess that up.  Similar comments apply for the
  cherry-pick tests in t35*.sh.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 0 insertions, 150 deletions

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
deleted file mode 100755
index 400a4cd..0000000
--- a/t/t6020-merge-df.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Fredrik Kuivinen
-#
-
-test_description='Test merge with directory/file conflicts'
-. ./test-lib.sh
-
-test_expect_success 'prepare repository' '
-	echo Hello >init &&
-	git add init &&
-	git commit -m initial &&
-
-	git branch B &&
-	mkdir dir &&
-	echo foo >dir/foo &&
-	git add dir/foo &&
-	git commit -m "File: dir/foo" &&
-
-	git checkout B &&
-	echo file dir >dir &&
-	git add dir &&
-	git commit -m "File: dir"
-'
-
-test_expect_success 'Merge with d/f conflicts' '
-	test_expect_code 1 git merge -m "merge msg" master
-'
-
-test_expect_success 'F/D conflict' '
-	git reset --hard &&
-	git checkout master &&
-	rm .git/index &&
-
-	mkdir before &&
-	echo FILE >before/one &&
-	echo FILE >after &&
-	git add . &&
-	git commit -m first &&
-
-	rm -f after &&
-	git mv before after &&
-	git commit -m move &&
-
-	git checkout -b para HEAD^ &&
-	echo COMPLETELY ANOTHER FILE >another &&
-	git add . &&
-	git commit -m para &&
-
-	git merge master
-'
-
-test_expect_success 'setup modify/delete + directory/file conflict' '
-	git checkout --orphan modify &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
-	git add letters &&
-	git commit -m initial &&
-
-	# Throw in letters.txt for sorting order fun
-	# ("letters.txt" sorts between "letters" and "letters/file")
-	echo i >>letters &&
-	echo "version 2" >letters.txt &&
-	git add letters letters.txt &&
-	git commit -m modified &&
-
-	git checkout -b delete HEAD^ &&
-	git rm letters &&
-	mkdir letters &&
-	>letters/file &&
-	echo "version 1" >letters.txt &&
-	git add letters letters.txt &&
-	git commit -m deleted
-'
-
-test_expect_success 'modify/delete + directory/file conflict' '
-	git checkout delete^0 &&
-	test_must_fail git merge modify &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test_path_is_file letters/file &&
-	test_path_is_file letters.txt &&
-	test_path_is_file letters~modify
-'
-
-test_expect_success 'modify/delete + directory/file conflict; other way' '
-	git reset --hard &&
-	git clean -f &&
-	git checkout modify^0 &&
-
-	test_must_fail git merge delete &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test_path_is_file letters/file &&
-	test_path_is_file letters.txt &&
-	test_path_is_file letters~HEAD
-'
-
-test_expect_success 'Simple merge in repo with interesting pathnames' '
-	# Simple lexicographic ordering of files and directories would be:
-	#     foo
-	#     foo/bar
-	#     foo/bar-2
-	#     foo/bar/baz
-	#     foo/bar-2/baz
-	# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
-	# can trip up some codepaths, and is the point of this test.
-	test_create_repo name-ordering &&
-	(
-		cd name-ordering &&
-
-		mkdir -p foo/bar &&
-		mkdir -p foo/bar-2 &&
-		>foo/bar/baz &&
-		>foo/bar-2/baz &&
-		git add . &&
-		git commit -m initial &&
-
-		git branch main &&
-		git branch other &&
-
-		git checkout other &&
-		echo other >foo/bar-2/baz &&
-		git add -u &&
-		git commit -m other &&
-
-		git checkout main &&
-		echo main >foo/bar/baz &&
-		git add -u &&
-		git commit -m main &&
-
-		git merge other &&
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
-		git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
-		test_cmp expect actual
-	)
-
-'
-
-test_done