subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1422064 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Date Fri, 14 Dec 2012 20:11:54 GMT
Author: philip
Date: Fri Dec 14 20:11:39 2012
New Revision: 1422064

URL: http://svn.apache.org/viewvc?rev=1422064&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
  (check_tree_conflict): Set is_conflicted output when an existing
   conflict is seen.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1422064&r1=1422063&r2=1422064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Dec 14 20:11:39 2012
@@ -250,6 +250,8 @@ check_tree_conflict(svn_boolean_t *is_co
       return SVN_NO_ERROR;
     }
 
+  *is_conflicted = TRUE;
+
   while (relpath_depth(conflict_root_relpath) > op_depth)
     conflict_root_relpath = svn_relpath_dirname(conflict_root_relpath,
                                                 scratch_pool);
@@ -277,7 +279,6 @@ check_tree_conflict(svn_boolean_t *is_co
   SVN_ERR(svn_wc__db_mark_conflict_internal(b->wcroot, conflict_root_relpath,
                                             conflict, scratch_pool));
 
-  *is_conflicted = TRUE;
   return SVN_NO_ERROR;
 }
 



Mime
View raw message