Code

Merge branch 'en/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:35 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:35 +0000 (17:52 -0800)
commit5acb623b72bde9ec96c48a8bb8f50e61371705ee
tree5d67a3d80b6e68c5b17ea872ae76ddb66bcdc165
parent106e3afa6f2d54ea520f9f156abca34913ae4968
parent9f6cea97c97ee505bd6771db7df69f04df9b4fc4
Merge branch 'en/merge-recursive'

* en/merge-recursive: (41 commits)
  t6022: Use -eq not = to test output of wc -l
  merge-recursive:make_room_for_directories - work around dumb compilers
  merge-recursive: Remove redundant path clearing for D/F conflicts
  merge-recursive: Make room for directories in D/F conflicts
  handle_delete_modify(): Check whether D/F conflicts are still present
  merge_content(): Check whether D/F conflicts are still present
  conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
  conflict_rename_delete(): Check whether D/F conflicts are still present
  merge-recursive: Delay modify/delete conflicts if D/F conflict present
  merge-recursive: Delay content merging for renames
  merge-recursive: Delay handling of rename/delete conflicts
  merge-recursive: Move handling of double rename of one file to other file
  merge-recursive: Move handling of double rename of one file to two
  merge-recursive: Avoid doubly merging rename/add conflict contents
  merge-recursive: Update merge_content() call signature
  merge-recursive: Update conflict_rename_rename_1to2() call signature
  merge-recursive: Structure process_df_entry() to handle more cases
  merge-recursive: Have process_entry() skip D/F or rename entries
  merge-recursive: New function to assist resolving renames in-core only
  merge-recursive: New data structures for deferring of D/F conflicts
  ...

Conflicts:
t/t6020-merge-df.sh
t/t6036-recursive-corner-cases.sh
merge-recursive.c
t/t3030-merge-recursive.sh
t/t6020-merge-df.sh
t/t6022-merge-rename.sh
t/t6036-recursive-corner-cases.sh