From: Elijah Newren <newren@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, agladysh@gmail.com
Subject: [PATCHv4 0/6] D/F conflict fixes
Date: Fri, 9 Jul 2010 07:10:50 -0600 [thread overview]
Message-ID: <1278681056-31460-1-git-send-email-newren@gmail.com> (raw)
This patch series fixes a number of spurious directory/file conflicts
and associated bugs appearing in cherry-pick, rebase, merge, and
fast-export. It also has a minor robustness improvement for
fast-import. This series includes testsuite fixes for currently known
failures in both t6020-merge-df.sh and t6035-merge-dir-to-symlink.sh.
Changes since the previous submission:
* Addressed comments from Junio in the previous round.
Alexander Gladysh (1):
Add a rename + D/F conflict testcase
Elijah Newren (5):
Add additional testcases for D/F conflicts
merge-recursive: Fix D/F conflicts
merge_recursive: Fix renames across paths below D/F conflicts
fast-export: Fix output order of D/F changes
fast-import: Improve robustness when D->F changes provided in wrong order
builtin/fast-export.c | 29 ++++++++++
fast-import.c | 8 +++
merge-recursive.c | 108 ++++++++++++++++++++++++++++++++-------
t/t3509-cherry-pick-merge-df.sh | 35 +++++++++++++
t/t6020-merge-df.sh | 2 +-
t/t6035-merge-dir-to-symlink.sh | 64 +++++++++++++++++++++--
t/t9350-fast-export.sh | 24 +++++++++
7 files changed, 247 insertions(+), 23 deletions(-)
next reply other threads:[~2010-07-09 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-09 13:10 Elijah Newren [this message]
2010-07-09 13:10 ` [PATCHv4 1/6] Add additional testcases for D/F conflicts Elijah Newren
2010-07-09 13:10 ` [PATCHv4 2/6] Add a rename + D/F conflict testcase Elijah Newren
2010-07-09 13:10 ` [PATCHv4 3/6] merge-recursive: Fix D/F conflicts Elijah Newren
2010-07-09 13:10 ` [PATCHv4 4/6] merge_recursive: Fix renames across paths below " Elijah Newren
2010-07-09 13:10 ` [PATCHv4 5/6] fast-export: Fix output order of D/F changes Elijah Newren
2010-07-09 13:10 ` [PATCHv4 6/6] fast-import: Improve robustness when D->F changes provided in wrong order Elijah Newren
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=1278681056-31460-1-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).