diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:54 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 2ff739f9d2fd2f34e7a7bfb9b5f2d1d2b2ec5326 (patch) | |
| tree | 3bc15a3797e3e9b33d69ef09aaeaf5d23f2a0584 /RelNotes | |
| parent | merge-recursive: New data structures for deferring of D/F conflicts (diff) | |
| download | tgif-2ff739f9d2fd2f34e7a7bfb9b5f2d1d2b2ec5326.tar.xz | |
merge-recursive: New function to assist resolving renames in-core only
process_renames() and process_entry() have nearly identical code for
doing three-way file merging to resolve content changes. Since we are
already deferring some of the current rename handling in order to better
handle D/F conflicts, it seems to make sense to defer content merging as
well and remove the (nearly) duplicated code sections for handling this
merging.
To facilitate this process, add a new update_stages_and_entry() function
which will map the higher stage index entries from two files involved in a
rename into the resulting rename destination's index entries, and update
the associated stage_data structure.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'RelNotes')
0 files changed, 0 insertions, 0 deletions