[PATCHv4 0/6] D/F conflict fixes

From: Elijah Newren <newren@gmail.com>
Date: Jul 9, 2010, 13:10 UTC
Message-ID: <1278681056-31460-1-git-send-email-newren@gmail.com>

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(-)