Revert the part of r39282 that made some declarations semi-public, as these
strings (which are part of the WC metadata format) are logically unrelated to
any strings used for presenting the corresponding data to the user and should
not need to be known outside that file.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__operation_map, svn_wc__conflict_action_map,
   svn_wc__conflict_reason_map): Remove "svn_wc__" prefix and make static.
  (read_one_tree_conflict, svn_wc__write_tree_conflicts): Adjust accordingly.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__operation_map, svn_wc__conflict_action_map,
   svn_wc__conflict_reason_map): Remove extern declarations.
--This line, and those below, will be ignored--

Index: subversion/libsvn_wc/tree_conflicts.c
===================================================================
--- subversion/libsvn_wc/tree_conflicts.c	(revision 39295)
+++ subversion/libsvn_wc/tree_conflicts.c	(working copy)
@@ -70,7 +70,6 @@
  */
 
 
-/* ### this should move to a more general location...  */
 /* A map for svn_node_kind_t values. */
 static const svn_token_map_t node_kind_map[] =
 {
@@ -82,7 +81,7 @@ static const svn_token_map_t node_kind_m
 };
 
 /* A map for svn_wc_operation_t values. */
-const svn_token_map_t svn_wc__operation_map[] =
+static const svn_token_map_t operation_map[] =
 {
   { "none",   svn_wc_operation_none },
   { "update", svn_wc_operation_update },
@@ -92,7 +91,7 @@ const svn_token_map_t svn_wc__operation_
 };
 
 /* A map for svn_wc_conflict_action_t values. */
-const svn_token_map_t svn_wc__conflict_action_map[] =
+static const svn_token_map_t conflict_action_map[] =
 {
   { "edited",   svn_wc_conflict_action_edit },
   { "deleted",  svn_wc_conflict_action_delete },
@@ -102,7 +101,7 @@ const svn_token_map_t svn_wc__conflict_a
 };
 
 /* A map for svn_wc_conflict_reason_t values. */
-const svn_token_map_t svn_wc__conflict_reason_map[] =
+static const svn_token_map_t conflict_reason_map[] =
 {
   { "edited",      svn_wc_conflict_reason_edited },
   { "deleted",     svn_wc_conflict_reason_deleted },
@@ -252,7 +251,7 @@ read_one_tree_conflict(svn_wc_conflict_d
              _("Invalid 'node_kind' field in tree conflict description"));
 
   /* operation */
-  SVN_ERR(read_enum_field(&n, svn_wc__operation_map,
+  SVN_ERR(read_enum_field(&n, operation_map,
                           skel->children->next->next->next));
   operation = (svn_wc_operation_t)n;
 
@@ -271,12 +270,12 @@ read_one_tree_conflict(svn_wc_conflict_d
                     scratch_pool));
 
   /* action */
-  SVN_ERR(read_enum_field(&n, svn_wc__conflict_action_map,
+  SVN_ERR(read_enum_field(&n, conflict_action_map,
                           skel->children->next->next->next->next));
   action = n;
 
   /* reason */
-  SVN_ERR(read_enum_field(&n, svn_wc__conflict_reason_map,
+  SVN_ERR(read_enum_field(&n, conflict_reason_map,
                           skel->children->next->next->next->next->next));
   reason = n;
 
@@ -429,16 +428,16 @@ svn_wc__write_tree_conflicts(const char 
         SVN_ERR(prepend_version_info_skel(c_skel, &null_version, pool));
 
       /* reason */
-      SVN_ERR(skel_prepend_enum(c_skel, svn_wc__conflict_reason_map,
-                                conflict->reason, pool));
+      SVN_ERR(skel_prepend_enum(c_skel, conflict_reason_map, conflict->reason,
+                                pool));
 
       /* action */
-      SVN_ERR(skel_prepend_enum(c_skel, svn_wc__conflict_action_map,
-                                conflict->action, pool));
+      SVN_ERR(skel_prepend_enum(c_skel, conflict_action_map, conflict->action,
+                                pool));
 
       /* operation */
-      SVN_ERR(skel_prepend_enum(c_skel, svn_wc__operation_map,
-                                conflict->operation, pool));
+      SVN_ERR(skel_prepend_enum(c_skel, operation_map, conflict->operation,
+                                pool));
 
       /* node_kind */
       SVN_ERR_ASSERT(conflict->node_kind == svn_node_dir
Index: subversion/libsvn_wc/tree_conflicts.h
===================================================================
--- subversion/libsvn_wc/tree_conflicts.h	(revision 39295)
+++ subversion/libsvn_wc/tree_conflicts.h	(working copy)
@@ -94,12 +94,6 @@ svn_wc__write_tree_conflicts(const char 
                              apr_pool_t *pool);
 
 
-/* Token mapping tables.  */
-extern const svn_token_map_t svn_wc__operation_map[];
-extern const svn_token_map_t svn_wc__conflict_action_map[];
-extern const svn_token_map_t svn_wc__conflict_reason_map[];
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */