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

[st...@apache.org]

Author: stsp
Date: Wed Mar 23 16:00:40 2016
New Revision: 1736344

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

* subversion/libsvn_client/conflicts.c
  (describe_local_file_node_change,
   describe_local_dir_node_change,
   describe_local_none_node_change): Obstructions are always in the way of
    something else which wants to occupy a path. So we can state that the
    obstructing item "already" occupies the path.

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