diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:53 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:38 -0700 |
| commit | 25c3936349ba052f0c7e9ba3ce138b89abcae6ee (patch) | |
| tree | cad69035537f824eaa339ad86478fde14986e27c /Documentation/RelNotes/1.5.0.5.txt | |
| parent | merge-recursive: Move process_entry's content merging into a function (diff) | |
| download | tgif-25c3936349ba052f0c7e9ba3ce138b89abcae6ee.tar.xz | |
merge-recursive: New data structures for deferring of D/F conflicts
Since we need to resolve paths (including renames) in-core first and defer
checking of D/F conflicts (namely waiting to see if directories are still
in the way after all paths are resolved) before updating files involved in
D/F conflicts, we will need to first process_renames, then record some
information about the rename needed at D/F resolution time, and then make
use of that information when resolving D/F conflicts at the end.
This commit adds some relevant data structures for storing the necessary
information.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.5.0.5.txt')
0 files changed, 0 insertions, 0 deletions