You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2018/11/16 09:27:42 UTC

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

Author: julianfoad
Date: Fri Nov 16 09:27:42 2018
New Revision: 1846704

URL: http://svn.apache.org/viewvc?rev=1846704&view=rev
Log:
Fix SVN-4717 "tree conflict message ends a sentence with a colon".

* subversion/libsvn_client/conflicts.c
  (describe_incoming_edit_list_modified_revs): Explicitly state when no
    revisions are found.

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=1846704&r1=1846703&r2=1846704&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Nov 16 09:27:42 2018
@@ -6143,6 +6143,9 @@ describe_incoming_edit_list_modified_rev
   const char *s = "";
   int i;
 
+  if (edits->nelts == 0)
+    return _(" (no revisions found)");
+
   if (edits->nelts <= max_revs_to_display)
     num_revs_to_skip = 0;
   else