From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 00/11] Start preparing merge-related tests to work with multiple merge backends
Date: Sat, 08 Aug 2020 17:01:09 +0000 [thread overview]
Message-ID: <pull.827.v2.git.git.1596906081.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.827.git.git.1596644952296.gitgitgadget@gmail.com>
This series starts preparing the merge related tests to work with multiple
backends: merge-recursive or merge-ort. Further work will be coming.
v1 of this series only had the first patch (which collected merge machinery
related tests into t64*.sh). This series adds 10 more patches, which:
Changes since v1:
* tighten some testcases so they don't pass with completely wrong results
* fix various errors in causing many test_expect_failure tests to fail for
the wrong reasons
* add clarifying comments or fix various comments
* make some tests more flexible in handling console output messages
produced by either backend.
* I'm curious about portability of the second-to-last patch -- is it safe
to use backreferences with test_i18n_grep? If not, anyone have
alternative ideas for handling those needed changes?
The greater flexibility patches at the end of the series also previews some
of the design changes being brought by merge-ort.
Elijah Newren (11):
Collect merge-related tests to t64xx
t6418: tighten delete/normalize conflict testcase
t6422: fix bad check against missing file
t6416, t6422: fix incorrect untracked file count
t6423: fix test setup for a couple tests
t6422: fix multiple errors with the mod6 test expectations
t6416, t6423: clarify some comments and fix some typos
t6423: add an explanation about why one of the tests does not pass
t6422, t6426: be more flexible for add/add conflicts involving renames
t642[23]: be more flexible for add/add conflicts involving pair
renames
t6425: be more flexible with rename/delete conflict messages
t/{t6020-merge-df.sh => t6400-merge-df.sh} | 0
...ss-cross.sh => t6401-merge-criss-cross.sh} | 0
...-merge-rename.sh => t6402-merge-rename.sh} | 0
...6023-merge-file.sh => t6403-merge-file.sh} | 0
...sive-merge.sh => t6404-recursive-merge.sh} | 0
...ge-symlinks.sh => t6405-merge-symlinks.sh} | 0
...6026-merge-attr.sh => t6406-merge-attr.sh} | 0
...-merge-binary.sh => t6407-merge-binary.sh} | 0
...p-to-date.sh => t6408-merge-up-to-date.sh} | 0
...erge-subtree.sh => t6409-merge-subtree.sh} | 0
...ge-filemode.sh => t6411-merge-filemode.sh} | 0
...-rename.sh => t6412-merge-large-rename.sh} | 0
...6033-merge-crlf.sh => t6413-merge-crlf.sh} | 0
...cruft.sh => t6414-merge-rename-nocruft.sh} | 0
...mlink.sh => t6415-merge-dir-to-symlink.sh} | 0
...ses.sh => t6416-recursive-corner-cases.sh} | 4 +-
...s-theirs.sh => t6417-merge-ours-theirs.sh} | 0
...-text-auto.sh => t6418-merge-text-auto.sh} | 3 +-
...gnorecase.sh => t6419-merge-ignorecase.sh} | 0
....sh => t6422-merge-rename-corner-cases.sh} | 68 +++++++++++--------
...s.sh => t6423-merge-rename-directories.sh} | 39 +++++++----
...=> t6424-merge-unrelated-index-changes.sh} | 0
...delete.sh => t6425-merge-rename-delete.sh} | 3 +-
...h => t6426-merge-skip-unneeded-updates.sh} | 2 +-
...ers.sh => t6427-diff3-conflict-markers.sh} | 0
...-recursive.sh => t6430-merge-recursive.sh} | 0
...-criscross.sh => t6431-merge-criscross.sh} | 0
...=> t6432-merge-recursive-space-options.sh} | 0
...ge-toplevel.sh => t6433-merge-toplevel.sh} | 0
...> t6434-merge-recursive-rename-options.sh} | 0
...-merge-sparse.sh => t6435-merge-sparse.sh} | 0
...-overwrite.sh => t6436-merge-overwrite.sh} | 0
...dule-merge.sh => t6437-submodule-merge.sh} | 0
...438-submodule-directory-file-conflicts.sh} | 0
...r-msgs.sh => t6439-merge-co-error-msgs.sh} | 0
35 files changed, 71 insertions(+), 48 deletions(-)
rename t/{t6020-merge-df.sh => t6400-merge-df.sh} (100%)
rename t/{t6021-merge-criss-cross.sh => t6401-merge-criss-cross.sh} (100%)
rename t/{t6022-merge-rename.sh => t6402-merge-rename.sh} (100%)
rename t/{t6023-merge-file.sh => t6403-merge-file.sh} (100%)
rename t/{t6024-recursive-merge.sh => t6404-recursive-merge.sh} (100%)
rename t/{t6025-merge-symlinks.sh => t6405-merge-symlinks.sh} (100%)
rename t/{t6026-merge-attr.sh => t6406-merge-attr.sh} (100%)
rename t/{t6027-merge-binary.sh => t6407-merge-binary.sh} (100%)
rename t/{t6028-merge-up-to-date.sh => t6408-merge-up-to-date.sh} (100%)
rename t/{t6029-merge-subtree.sh => t6409-merge-subtree.sh} (100%)
rename t/{t6031-merge-filemode.sh => t6411-merge-filemode.sh} (100%)
rename t/{t6032-merge-large-rename.sh => t6412-merge-large-rename.sh} (100%)
rename t/{t6033-merge-crlf.sh => t6413-merge-crlf.sh} (100%)
rename t/{t6034-merge-rename-nocruft.sh => t6414-merge-rename-nocruft.sh} (100%)
rename t/{t6035-merge-dir-to-symlink.sh => t6415-merge-dir-to-symlink.sh} (100%)
rename t/{t6036-recursive-corner-cases.sh => t6416-recursive-corner-cases.sh} (99%)
rename t/{t6037-merge-ours-theirs.sh => t6417-merge-ours-theirs.sh} (100%)
rename t/{t6038-merge-text-auto.sh => t6418-merge-text-auto.sh} (99%)
rename t/{t6039-merge-ignorecase.sh => t6419-merge-ignorecase.sh} (100%)
rename t/{t6042-merge-rename-corner-cases.sh => t6422-merge-rename-corner-cases.sh} (94%)
rename t/{t6043-merge-rename-directories.sh => t6423-merge-rename-directories.sh} (98%)
rename t/{t6044-merge-unrelated-index-changes.sh => t6424-merge-unrelated-index-changes.sh} (100%)
rename t/{t6045-merge-rename-delete.sh => t6425-merge-rename-delete.sh} (72%)
rename t/{t6046-merge-skip-unneeded-updates.sh => t6426-merge-skip-unneeded-updates.sh} (99%)
rename t/{t6047-diff3-conflict-markers.sh => t6427-diff3-conflict-markers.sh} (100%)
rename t/{t3030-merge-recursive.sh => t6430-merge-recursive.sh} (100%)
rename t/{t3031-merge-criscross.sh => t6431-merge-criscross.sh} (100%)
rename t/{t3032-merge-recursive-space-options.sh => t6432-merge-recursive-space-options.sh} (100%)
rename t/{t3033-merge-toplevel.sh => t6433-merge-toplevel.sh} (100%)
rename t/{t3034-merge-recursive-rename-options.sh => t6434-merge-recursive-rename-options.sh} (100%)
rename t/{t3035-merge-sparse.sh => t6435-merge-sparse.sh} (100%)
rename t/{t7607-merge-overwrite.sh => t6436-merge-overwrite.sh} (100%)
rename t/{t7405-submodule-merge.sh => t6437-submodule-merge.sh} (100%)
rename t/{t7613-merge-submodule.sh => t6438-submodule-directory-file-conflicts.sh} (100%)
rename t/{t7609-merge-co-error-msgs.sh => t6439-merge-co-error-msgs.sh} (100%)
base-commit: dc04167d378fb29d30e1647ff6ff51dd182bc9a3
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-827%2Fnewren%2Fmerge-test-rename-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-827/newren/merge-test-rename-v2
Pull-Request: https://github.com/git/git/pull/827
Range-diff vs v1:
1: 3a2b7e9743 = 1: 3a2b7e9743 Collect merge-related tests to t64xx
-: ---------- > 2: 621c9a159e t6418: tighten delete/normalize conflict testcase
-: ---------- > 3: 7f408b7d40 t6422: fix bad check against missing file
-: ---------- > 4: 9ce80f2f94 t6416, t6422: fix incorrect untracked file count
-: ---------- > 5: 382d65649d t6423: fix test setup for a couple tests
-: ---------- > 6: 56e169b1d8 t6422: fix multiple errors with the mod6 test expectations
-: ---------- > 7: 7b534d123a t6416, t6423: clarify some comments and fix some typos
-: ---------- > 8: f2d7e744fc t6423: add an explanation about why one of the tests does not pass
-: ---------- > 9: b4e165eca4 t6422, t6426: be more flexible for add/add conflicts involving renames
-: ---------- > 10: a9a02a0ca5 t642[23]: be more flexible for add/add conflicts involving pair renames
-: ---------- > 11: 38f6573511 t6425: be more flexible with rename/delete conflict messages
--
gitgitgadget
next prev parent reply other threads:[~2020-08-08 17:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 16:29 [PATCH] Collect merge-related tests to t64xx Elijah Newren via GitGitGadget
2020-08-08 17:01 ` Elijah Newren via GitGitGadget [this message]
2020-08-08 17:01 ` [PATCH v2 01/11] " Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 02/11] t6418: tighten delete/normalize conflict testcase Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 03/11] t6422: fix bad check against missing file Elijah Newren via GitGitGadget
2020-08-09 2:30 ` Eric Sunshine
2020-08-08 17:01 ` [PATCH v2 04/11] t6416, t6422: fix incorrect untracked file count Elijah Newren via GitGitGadget
2020-08-09 3:12 ` Eric Sunshine
2020-08-09 5:34 ` Elijah Newren
2020-08-08 17:01 ` [PATCH v2 05/11] t6423: fix test setup for a couple tests Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 06/11] t6422: fix multiple errors with the mod6 test expectations Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 07/11] t6416, t6423: clarify some comments and fix some typos Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 08/11] t6423: add an explanation about why one of the tests does not pass Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 09/11] t6422, t6426: be more flexible for add/add conflicts involving renames Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 10/11] t642[23]: be more flexible for add/add conflicts involving pair renames Elijah Newren via GitGitGadget
2020-08-08 17:01 ` [PATCH v2 11/11] t6425: be more flexible with rename/delete conflict messages Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 00/11] Start preparing merge-related tests to work with multiple merge backends Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 01/11] Collect merge-related tests to t64xx Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 02/11] t6418: tighten delete/normalize conflict testcase Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 03/11] t6422: fix bad check against missing file Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 04/11] t6416, t6422: fix incorrect untracked file count Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 05/11] t6423: fix test setup for a couple tests Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 06/11] t6422: fix multiple errors with the mod6 test expectations Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 07/11] t6416, t6423: clarify some comments and fix some typos Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 08/11] t6423: add an explanation about why one of the tests does not pass Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 09/11] t6422, t6426: be more flexible for add/add conflicts involving renames Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 10/11] t642[23]: be more flexible for add/add conflicts involving pair renames Elijah Newren via GitGitGadget
2020-08-10 22:29 ` [PATCH v3 11/11] t6425: be more flexible with rename/delete conflict messages Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.827.v2.git.git.1596906081.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.