svn commit: r1099775 - /subversion/trunk/subversion/svn/commit-cmd.c

[st...@apache.org]

Author: stsp
Date: Thu May  5 12:46:36 2011
New Revision: 1099775

URL: http://svn.apache.org/viewvc?rev=1099775&view=rev
Log:
* subversion/svn/commit-cmd.c
  (copy_warning_notify_func): Make the warning shorter and less ambiguous.

Suggested by: rhuijben
              julianfoad


Modified:
    subversion/trunk/subversion/svn/commit-cmd.c

Modified: subversion/trunk/subversion/svn/commit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/commit-cmd.c?rev=1099775&r1=1099774&r2=1099775&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/commit-cmd.c (original)
+++ subversion/trunk/subversion/svn/commit-cmd.c Thu May  5 12:46:36 2011
@@ -76,15 +76,10 @@ copy_warning_notify_func(void *baton,
     {
       svn_error_t *err;
       err = svn_cmdline_printf(pool,
-                               _("svn: warning: The depth of this commit "
-                                 "is '%s', but copied directories will "
-                                 "regardless be committed with depth '%s'.  "
-                                 "You must remove unwanted children of those "
-                                 "directories in a separate commit.  "
-                                 "(Suppressing additional instances of this "
-                                 "warning.)\n"),
-                               svn_depth_to_word(b->depth),
-                               svn_depth_to_word(svn_depth_infinity));
+                               _("svn: The depth of this commit is '%s', "
+                                 "but copies are always performed "
+                                 "recursively in the repository.\n"),
+                               svn_depth_to_word(b->depth));
       /* ### FIXME: Try to return this error showhow? */
       svn_error_clear(err);