Author: rhuijben
Date: Tue Jun 7 10:54:19 2011
New Revision: 1132951
URL: http://svn.apache.org/viewvc?rev=1132951&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(svn_wc_delete4): Following up on r1132948 and r1132919, answer my own
question: We can't just remove conflict markers in a keep_local scenario,
as that would remove conflict markers from the wrong directory, in case
we are just changing the casing of a node on a case insensitive filesystem.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1132951&r1=1132950&r2=1132951&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Jun 7 10:54:19 2011
@@ -666,7 +666,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
pool));
/* Read conflicts, to allow deleting the markers after updating the DB */
- if (conflicted)
+ if (!keep_local && conflicted)
SVN_ERR(svn_wc__db_read_conflicts(&conflicts, db, local_abspath,
scratch_pool, scratch_pool));
@@ -675,7 +675,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
cancel_func, cancel_baton,
pool));
- if (conflicted && conflicts != NULL /* && !keep_local */) /* ### Enable? */
+ if (!keep_local && conflicted && conflicts != NULL)
{
int i;
