svn commit: r1736342 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Wed Mar 23 15:28:15 2016
New Revision: 1736342

URL: http://svn.apache.org/viewvc?rev=1736342&view=rev
Log:
In the conflict resolver, improve descriptions for local obstructions.

* subversion/libsvn_client/conflicts.c
  (describe_local_file_node_change,
   describe_local_dir_node_change,
   describe_local_none_node_change): Currently, versioned items may be labeled
    "obstructions" by the update/merge code when flagging a tree conflict.
    Change the wording of corresponding descriptions and stop imlpying that
    obstructions are always unversioned (I think they should be, but well).

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=1736342&r1=1736341&r2=1736342&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 23 15:28:15 2016
@@ -366,8 +366,8 @@ describe_local_file_node_change(const ch
                            "in the working copy.");
         break;
       case svn_wc_conflict_reason_obstructed:
-        *description = _("An unversioned file was found in the working "
-                         "copy where a versioned item was expected.");
+        *description = _("A file which occupies this path was found in the "
+                          "working copy.");
         break;
       case svn_wc_conflict_reason_unversioned:
         *description = _("An unversioned file was found in the working "
@@ -578,9 +578,8 @@ describe_local_dir_node_change(const cha
                            "branch was found in the working copy.");
         break;
       case svn_wc_conflict_reason_obstructed:
-        *description = _("An unversioned directory was found in the "
-                         "working copy where a versioned item was "
-                         "expected.");
+        *description = _("A directory which occupies this path was found "
+                         "in the working copy.");
         break;
       case svn_wc_conflict_reason_unversioned:
         *description = _("An unversioned directory was found in the "
@@ -883,8 +882,8 @@ describe_local_none_node_change(const ch
                        "found in the working copy.");
       break;
     case svn_wc_conflict_reason_obstructed:
-      *description = _("An unversioned item was found in the working "
-                       "copy where a versioned item was expected.");
+      *description = _("An item which obstructs this path was found in "
+                       "the working copy.");
       break;
     case svn_wc_conflict_reason_deleted:
       *description = _("A deleted item was found in the working copy.");