Author: stsp
Date: Fri Aug 22 12:18:58 2014
New Revision: 1619777
URL: http://svn.apache.org/r1619777
Log:
Slightly improve some tree conflict reason (local change) and
action (incoming change) descriptions.
* subversion/svn/cl-conflicts.c
(local_reason_str): For merge, a missing node might actually be missing,
not only deleted or moved away.
(incoming_action_str): Indicate replacing node kind when describing
incoming replacements.
* subversion/tests/cmdline/tree_conflict_tests.py
(actual_only_node_behaviour): Adjust expected output.
Modified:
subversion/trunk/subversion/svn/cl-conflicts.c
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/svn/cl-conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl-conflicts.c?rev=1619777&r1=1619776&r2=1619777&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl-conflicts.c (original)
+++ subversion/trunk/subversion/svn/cl-conflicts.c Fri Aug 22 12:18:58 2014
@@ -139,7 +139,7 @@ local_reason_str(svn_node_kind_t kind, s
return _("local delete");
case svn_wc_conflict_reason_missing:
if (operation == svn_wc_operation_merge)
- return _("local deleted or moved away");
+ return _("local missing or deleted or moved away");
else
return _("local missing");
case svn_wc_conflict_reason_unversioned:
@@ -176,7 +176,7 @@ incoming_action_str(svn_node_kind_t kind
case svn_wc_conflict_action_delete:
return _("incoming file delete or move");
case svn_wc_conflict_action_replace:
- return _("incoming file replace");
+ return _("incoming replace with file");
}
break;
case svn_node_dir:
@@ -189,7 +189,7 @@ incoming_action_str(svn_node_kind_t kind
case svn_wc_conflict_action_delete:
return _("incoming dir delete or move");
case svn_wc_conflict_action_replace:
- return _("incoming dir replace");
+ return _("incoming replace with dir");
}
break;
case svn_node_none:
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1619777&r1=1619776&r2=1619777&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri Aug 22
12:18:58 2014
@@ -1258,7 +1258,7 @@ def actual_only_node_behaviour(sbox):
# info
expected_info = {
- 'Tree conflict': 'local deleted or moved away, incoming file edit upon
merge.*',
+ 'Tree conflict': 'local missing or deleted or moved away, incoming file
edit upon merge.*',
'Name': 'foo',
'Schedule': 'normal',
'Node Kind': 'none',
