All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/4] Directory rename detection testcases and rules
Date: Thu, 15 Oct 2020 20:46:26 +0000	[thread overview]
Message-ID: <pull.879.git.git.1602794790.gitgitgadget@gmail.com> (raw)

While testing merge-ort on some real world repositories a little while back,
I found some issues with directory rename detection...some of which were
issues in the current merge-recursive as well. Also, I found that there was
a nice optimization I could use if a new obvious-looking rule was added,
though it has one slight side effect to one corner case. Fixing the bugs and
implementing the new rules is a bit more involved, so for now this series
just updates the rule descriptions and adds or modifies tests to document
the various cases.

Elijah Newren (4):
  directory-rename-detection.txt: update references to regression tests
  t6423: more involved directory rename test
  t6423: update directory rename detection tests with new rule
  t6423: more involved rules for renaming directories into each other

 .../technical/directory-rename-detection.txt  |  15 +-
 t/t6423-merge-rename-directories.sh           | 592 ++++++++++++++++--
 2 files changed, 553 insertions(+), 54 deletions(-)


base-commit: d4a392452e292ff924e79ec8458611c0f679d6d4
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-879%2Fnewren%2Fdrd-testcases-and-rules-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-879/newren/drd-testcases-and-rules-v1
Pull-Request: https://github.com/git/git/pull/879
-- 
gitgitgadget

             reply	other threads:[~2020-10-15 20:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-15 20:46 Elijah Newren via GitGitGadget [this message]
2020-10-15 20:46 ` [PATCH 1/4] directory-rename-detection.txt: update references to regression tests Elijah Newren via GitGitGadget
2020-10-15 20:46 ` [PATCH 2/4] t6423: more involved directory rename test Elijah Newren via GitGitGadget
2020-10-15 20:57   ` Eric Sunshine
2020-10-15 20:46 ` [PATCH 3/4] t6423: update directory rename detection tests with new rule Elijah Newren via GitGitGadget
2020-10-15 20:46 ` [PATCH 4/4] t6423: more involved rules for renaming directories into each other 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.879.git.git.1602794790.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.