Author: stsp
Date: Fri Nov 23 14:30:42 2018
New Revision: 1847273
URL: http://svn.apache.org/viewvc?rev=1847273&view=rev
Log:
Follow-up to r1846851:
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_file_text_merge): Don't forget to remove the
conflict marker after the 'local missing' conflict has been resolved.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1847273&r1=1847272&r2=1847273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Nov 23 14:30:42
2018
@@ -8760,6 +8760,14 @@ resolve_incoming_move_file_text_merge(sv
if (err)
goto unlock_wc;
}
+ else if (local_change == svn_wc_conflict_reason_missing)
+ {
+ /* Clear tree conflict marker. */
+ err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath,
+ scratch_pool);
+ if (err)
+ goto unlock_wc;
+ }
if (ctx->notify_func2)
{
