Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4B6BF200C0C for ; Mon, 30 Jan 2017 16:13:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 49E43160B4D; Mon, 30 Jan 2017 15:13:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9121C160B41 for ; Mon, 30 Jan 2017 16:13:54 +0100 (CET) Received: (qmail 20853 invoked by uid 500); 30 Jan 2017 15:13:53 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 20843 invoked by uid 99); 30 Jan 2017 15:13:53 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2017 15:13:53 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0F66A3A2199 for ; Mon, 30 Jan 2017 15:13:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1780921 - /subversion/trunk/subversion/svn/svn.c Date: Mon, 30 Jan 2017 15:13:52 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170130151353.0F66A3A2199@svn01-us-west.apache.org> archived-at: Mon, 30 Jan 2017 15:13:55 -0000 Author: stsp Date: Mon Jan 30 15:13:52 2017 New Revision: 1780921 URL: http://svn.apache.org/viewvc?rev=1780921&view=rev Log: Improve wording in help text of 'svn copy' and 'svn move'. * subversion/svn/svn.c (svn_cl__cmd_table): Explain more clearly what happens when copying/moving multiple sources. Explicitly state that the destination must be an existing directory in this case. Modified: subversion/trunk/subversion/svn/svn.c Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1780921&r1=1780920&r2=1780921&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Mon Jan 30 15:13:52 2017 @@ -653,8 +653,9 @@ const svn_opt_subcommand_desc2_t svn_cl_ " WC -> URL: immediately commit a copy of WC to URL\n" " URL -> WC: check out URL into WC, schedule for addition\n" " URL -> URL: complete server-side copy; used to branch and tag\n" - " All the SRCs must be of the same type. When copying multiple sources,\n" - " they will be added as children of DST, which must be a directory.\n" + " All the SRCs must be of the same type. If DST is an existing directory,\n" + " the sources will be added as children of DST. When copying multiple\n" + " sources, DST must be an existing directory.\n" "\n" " WARNING: For compatibility with previous versions of Subversion,\n" " copies performed using two working copy paths (WC -> WC) will not\n" @@ -1306,8 +1307,9 @@ const svn_opt_subcommand_desc2_t svn_cl_ " be committed later (with or without further changes)\n" " URL -> URL: move an item in the repository directly, immediately\n" " creating a new revision in the repository\n" - " All the SRCs must be of the same type. When moving multiple sources,\n" - " they will be added as children of DST, which must be a directory.\n" + " All the SRCs must be of the same type. If DST is an existing directory,\n" + " the sources will be added as children of DST. When moving multiple\n" + " sources, DST must be an existing directory.\n" "\n" " SRC and DST of WC -> WC moves must be committed in the same revision.\n" " Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n"