[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1806552 - /subversion/branches/shelve/subversion/svn/svn.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 29 Aug 2017 12:40:01 +0200

> -----Original Message-----
> From: julianfoad_at_apache.org [mailto:julianfoad_at_apache.org]
> Sent: dinsdag 29 augustus 2017 12:25
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1806552 -
> /subversion/branches/shelve/subversion/svn/svn.c
>
> Author: julianfoad
> Date: Tue Aug 29 10:25:21 2017
> New Revision: 1806552
>
> URL: http://svn.apache.org/viewvc?rev=1806552&view=rev
> Log:
> On the 'shelve' branch: Expand & clarify help text; state limitations.
>
> * subversion/svn/svn.c
> (svn_cl__cmd_table): Tweak help text for shelve commands.
>
> Modified:
> subversion/branches/shelve/subversion/svn/svn.c
>
> Modified: subversion/branches/shelve/subversion/svn/svn.c
> URL:
> http://svn.apache.org/viewvc/subversion/branches/shelve/subversion/svn/
> svn.c?rev=1806552&r1=1806551&r2=1806552&view=diff
> ==========================================================
> ====================
> --- subversion/branches/shelve/subversion/svn/svn.c (original)
> +++ subversion/branches/shelve/subversion/svn/svn.c Tue Aug 29 10:25:21
> 2017
> @@ -1650,23 +1650,31 @@ const svn_opt_subcommand_desc2_t svn_cl_
> {opt_targets, 'R', opt_depth, 'q', opt_changelist} },
>
> { "shelve", svn_cl__shelve, {0}, N_
> - ("Shelve changes.\n"
> + ("Put a local change aside, as if putting it on a shelf.\n"
> "usage: 1. shelve [--keep-local] NAME PATH...\n"
> " 2. shelve --delete NAME\n"
> " 3. shelve --list\n"
> "\n"
> - " 1. Save the local changes in the given PATHs to a patch file, and\n"
> - " revert those changes from the WC unless '--keep-local' is given.\n"
> + " 1. Save the local change in the given PATHs to a patch file, and\n"
> + " revert that change from the WC unless '--keep-local' is given.\n"
> " If a log message is given with '-m' or '-F', include it at the\n"
> " beginning of the patch file.\n"
> "\n"
> - " 2. Delete the shelved patch NAME.\n"
> + " 2. Delete the shelved change NAME.\n"
> "\n"
> - " 3. List shelved patches. Include the first line of any log message\n"
> - " and some details about the contents of the patch, unless '-q' is\n"
> + " 3. List shelved changes. Include the first line of any log message\n"
> + " and some details about the contents of the change, unless '-q' is\n"
> " given.\n"
> "\n"
> - " Patch files are named .svn/shelves/NAME.patch\n"),
> + " The kinds of change you can shelve are those supported by 'svn diff'\n"
> + " and 'svn patch'. The following are currently NOT supported:\n"
> + " mergeinfo changes, copies, moves, mkdir, rmdir,\n"
> + " 'binary' content, uncommittable states\n"

svn patch supports binary content. The limitation here is probably that currently only 'svn diff --git' produces the patches in the proper form, while other invocations skip binary files.

        Bert
Received on 2017-08-29 12:40:14 CEST

This is an archived mail posted to the Subversion Dev mailing list.