diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:20:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:40 (GMT) |
| commit | 6d63070cacf88cd03b4bc73fd64fea046accd450 (patch) | |
| tree | 812502fc3d4ec37dc712937ae9898b18e1e2b901 /merge-recursive.c | |
| parent | b630b8147055a6fd56edfdf3ba85e9dea27dd397 (diff) | |
| download | git-6d63070cacf88cd03b4bc73fd64fea046accd450.zip git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.gz git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.bz2 | |
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
Earlier in this series, the patch "merge-recursive: add handling for
rename/rename/add-dest/add-dest" added code to handle the rename on each
side of history also being involved in a rename/add conflict, but only
did so in the non-recursive case. Add code for the recursive case,
ensuring that the "added" files are not simply deleted.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 71febe9..78555b6 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1159,6 +1159,8 @@ static void conflict_rename_rename_1to2(struct merge_options *o, o->call_depth ? " (left unresolved)" : ""); if (o->call_depth) { struct merge_file_info mfi; + struct diff_filespec other; + struct diff_filespec *add; mfi = merge_file(o, one->path, one->sha1, one->mode, a->sha1, a->mode, @@ -1171,8 +1173,25 @@ static void conflict_rename_rename_1to2(struct merge_options *o, * unique path, or use that unique path instead of src here. */ update_file(o, 0, mfi.sha, mfi.mode, one->path); - remove_file_from_cache(a->path); - remove_file_from_cache(b->path); + + /* + * Above, we put the merged content at the merge-base's + * path. Now we usually need to delete both a->path and + * b->path. However, the rename on each side of the merge + * could also be involved in a rename/add conflict. In + * such cases, we should keep the added file around, + * resolving the conflict at that path in its favor. + */ + add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); + if (add) + update_file(o, 0, add->sha1, add->mode, a->path); + else + remove_file_from_cache(a->path); + add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); + if (add) + update_file(o, 0, add->sha1, add->mode, b->path); + else + remove_file_from_cache(b->path); } else { handle_file(o, a, 2, ci); handle_file(o, b, 3, ci); |