Login | Register
My pages Projects Community openCollabNet

Discussions > svn > svn commit: r38903 - in trunk/subversion: include libsvn_wc svn

subversion
Discussion topic

Back to topic list

svn commit: r38903 - in trunk/subversion: include libsvn_wc svn

Author stsp
Full name Stefan Sperling
Date 2009-08-21 06:02:51 PDT
Message Author: stsp
Date: Fri Aug 21 05:56:39 2009
New Revision: 38903

Log:
Introduce new conflict action and reason types to describe replaced items.

* subversion/include/svn_wc.h
  (svn_wc_conflict_action_t): New enum value svn_wc_conflict_action_replace.
  (svn_wc_conflict_reason_t): New enum avlue svn_wc_conflict_reas​on_replaced.

* subversion/svn/tree-conflicts.c
  (action_str, reason_str, svn_cl__append_tree_​conflict_info_xml): Handle
   new conflict action and reason types.

* subversion/libsvn_wc​/tree_conflicts.c
  (action_map): Add new conflict type to action map.
  (reason_map): Add new conflict type to reason map.

Modified:
   trunk/subversion/inc​lude/svn_wc.h
   trunk/subversion/lib​svn_wc/tree_conflict​s.c
   trunk/subversion/svn​/tree-conflicts.c

Modified: trunk/subversion/inc​lude/svn_wc.h
URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/include/sv​n_wc.h?pathrev=38903​&r1=38902&r2​=38903
====================​====================​====================​==================
--- trunk/subversion/inc​lude/svn_wc.h Fri Aug 21 03:47:03 2009 (r38902)
+++ trunk/subversion/inc​lude/svn_wc.h Fri Aug 21 05:56:39 2009 (r38903)
@@ -1263,8 +1263,9 @@ typedef enum svn_wc_conflict_action_t
 {
   svn_wc_conflict_action_edit, /* attempting to change text or props */
   svn_wc_conflict_action_add, /* attempting to add object */
- svn_wc_conflict_action_delete /* attempting to delete object */
-
+ svn_wc_conflict_action_delete, /* attempting to delete object */
+ svn_wc_conflict_action_replace /* attempting to replace object,
+ @since New in 1.7 */
 } svn_wc_conflict_action_t;
 
 
@@ -1285,7 +1286,9 @@ typedef enum svn_wc_conflict_reason_t
   /** Object is unversioned */
   svn_wc_conflict_reas​on_unversioned,
   /** Object is already added or schedule-add. @since New in 1.6. */
- svn_wc_conflict_reason_added
+ svn_wc_conflict_reason_added,
+ /** Object is already replaced. @since New in 1.7. */
+ svn_wc_conflict_reason_replaced
 
 } svn_wc_conflict_reason_t;
 

Modified: trunk/subversion/lib​svn_wc/tree_conflict​s.c
URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/libsvn_wc/​tree_conflicts.c?pat​hrev=38903&r1=38​902&r2=38903
====================​====================​====================​==================
--- trunk/subversion/lib​svn_wc/tree_conflict​s.c Fri Aug 21 03:47:03 2009 (r38902)
+++ trunk/subversion/lib​svn_wc/tree_conflict​s.c Fri Aug 21 05:56:39 2009 (r38903)
@@ -102,6 +102,7 @@ static const enum_mapping_t action_map[]
   { "edited", svn_wc_conflict_action_edit },
   { "deleted", svn_wc_conflict_action_delete },
   { "added", svn_wc_conflict_action_add },
+ { "replace", svn_wc_conflict_action_replace },
   { NULL, 0 }
 };
 
@@ -113,6 +114,7 @@ static const enum_mapping_t reason_map[]
   { "missing", svn_wc_conflict_reason_missing },
   { "obstructed", svn_wc_conflict_reas​on_obstructed },
   { "added", svn_wc_conflict_reason_added },
+ { "replaced", svn_wc_conflict_reason_replaced },
   { NULL, 0 }
 };
 

Modified: trunk/subversion/svn​/tree-conflicts.c
URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/svn/tree-c​onflicts.c?pathrev=3​8903&r1=38902​&r2=38903
====================​====================​====================​==================
--- trunk/subversion/svn​/tree-conflicts.c Fri Aug 21 03:47:03 2009 (r38902)
+++ trunk/subversion/svn​/tree-conflicts.c Fri Aug 21 05:56:39 2009 (r38903)
@@ -42,6 +42,8 @@ action_str(const svn_wc_conflict_descrip
         return _("add");
       case svn_wc_conflict_action_delete:
         return _("delete");
+ case svn_wc_conflict_action_replace:
+ return _("replace");
     }
   return NULL;
 }
@@ -64,6 +66,8 @@ reason_str(const svn_wc_conflict_descrip
         return _("missing");
       case svn_wc_conflict_reas​on_unversioned:
         return _("unversioned");
+ case svn_wc_conflict_reas​on_replaced:
+ return _("replace");
     }
   return NULL;
 }
@@ -153,6 +157,9 @@ svn_cl__append_tree_​conflict_info_xml(
       case svn_wc_conflict_action_delete:
         tmp = "delete";
         break;
+ case svn_wc_conflict_action_replace:
+ tmp = "replace";
+ break;
       default:
         SVN_ERR_MALFUNCTION();
     }
@@ -179,6 +186,9 @@ svn_cl__append_tree_​conflict_info_xml(
       case svn_wc_conflict_reas​on_unversioned:
         tmp = "unversioned";
         break;
+ case svn_wc_conflict_reas​on_replaced:
+ tmp = "replace";
+ break;
       default:
         SVN_ERR_MALFUNCTION();
     }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r38903 - in trunk/subversion: include libsvn_wc svn stsp Stefan Sperling 2009-08-21 06:02:51 PDT
Messages per page: