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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Bert Huijben-5


> -----Original Message-----
> From: [hidden email] [mailto:[hidden email]]
> Sent: dinsdag 29 augustus 2017 12:25
> To: [hidden email]
> 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


Reply | Threaded
Open this post in threaded view
|

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

Julian Foad-5
Bert Huijben wrote:
> 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.

Yes, this is noted right at the end of the design doc:
https://docs.google.com/document/d/1PVgw0BdPF7v67oxIK7B_Yjmr3p28ojabP5N1PfZTsHk/edit#heading=h.4sj99cgksge9

Thanks for mentioning it.

- Julian