From: newren@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, spearce@spearce.org, agladysh@gmail.com
Subject: [PATCHv3 0/6] D/F conflict fixes
Date: Tue, 6 Jul 2010 23:20:28 -0600 [thread overview]
Message-ID: <1278480034-22939-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.
The right person to review most the changes (all but the trivial
fast-import change that Shawn already commented on, modulo one minor new
change) is probably Dscho. In his absence, the next most logical
reviewer as far as I can tell is probably Junio or perhaps Shawn. I
hate to overwork them even more, so if anyone else has some time to take
a look or even do some simple testing, it'd be much appreciated.
Changes since the previous submission:
* Added a new patch (5/6) fixing fast-export -- Shawn pointed out
in the previous round that the bug I attributed to fast-import was
actually a fast-export issue
* Modified the fast-import patch (6/6) to note that it was just a
robustness improvement rather than bugfix, and extended the patch to
also handle regular files in addition to symlinks
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 | 1 +
diff.h | 1 +
fast-import.c | 7 +++
merge-recursive.c | 106 ++++++++++++++++++++++++++++++++-------
t/t3508-cherry-pick-merge-df.sh | 34 ++++++++++++
t/t6020-merge-df.sh | 2 +-
t/t6035-merge-dir-to-symlink.sh | 37 +++++++++++++-
t/t9350-fast-export.sh | 24 +++++++++
tree-diff.c | 4 +-
9 files changed, 194 insertions(+), 22 deletions(-)
next reply other threads:[~2010-07-07 5:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-07 5:20 newren [this message]
2010-07-07 5:20 ` [PATCHv3 1/6] Add additional testcases for D/F conflicts newren
2010-07-07 21:25 ` Junio C Hamano
2010-07-08 3:07 ` Elijah Newren
2010-07-08 16:03 ` Junio C Hamano
2010-07-07 5:20 ` [PATCHv3 2/6] Add a rename + D/F conflict testcase newren
2010-07-07 21:26 ` Junio C Hamano
2010-07-08 5:04 ` Elijah Newren
2010-07-07 5:20 ` [PATCHv3 3/6] merge-recursive: Fix D/F conflicts newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:34 ` Elijah Newren
2010-07-07 5:20 ` [PATCHv3 4/6] merge_recursive: Fix renames across paths below " newren
2010-07-07 5:20 ` [PATCHv3 5/6] fast-export: Fix output order of D/F changes newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:36 ` Elijah Newren
2010-07-08 6:04 ` Junio C Hamano
2010-07-07 5:20 ` [PATCHv3 6/6] fast-import: Improve robustness when D->F changes provided in wrong order 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1278480034-22939-1-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).