| commit | 099f3c421a446e2eef3a1bb6aea0e451711ddd88 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jun 2012 22:04:11 +0000 (7 15:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2012 21:40:03 +0000 (9 14:40 -0700) | ||
| tree | 4b867c8cb14a5d9aa181bc9958cb199544c03b83 | treesnapshot (tar.gz zip) |
| parent | e09837e25d50cba97ffcc2934801dbd861e4276d | commitdiff |
apply: --3way with add/add conflict
When a patch wants to create a path, but we already have it in our
current state, pretend as if the patch and we independently added
the same path and cause add/add conflict, so that the user can
resolve it just like "git merge" in the same situation.
For that purpose, implement load_current() in terms of the
load_patch_target() helper introduced earlier to read the current
contents from the path given by patch->new_name (patch->old_name is
NULL for a creation patch).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a patch wants to create a path, but we already have it in our
current state, pretend as if the patch and we independently added
the same path and cause add/add conflict, so that the user can
resolve it just like "git merge" in the same situation.
For that purpose, implement load_current() in terms of the
load_patch_target() helper introduced earlier to read the current
contents from the path given by patch->new_name (patch->old_name is
NULL for a creation patch).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/apply.c | diffblobblamehistory |