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

Re: svn commit: r34318 - trunk/subversion/svn

From: Dongsheng Song <dongsheng.song_at_gmail.com>
Date: Fri, 9 Jan 2009 00:23:03 +0800

In your examples, '*' is eight.
For the help msg, what's eight mean?

2009/1/9 Julian Foad <julianfoad_at_btopenworld.com>:
> On Thu, 2009-01-08 at 15:52 +0800, Dongsheng Song wrote:
>> > The out-of-date information appears in the ninth column (with -u):\n"
>>
>> ninth or eight ?
>
> Ninth. It's correct, as far as I can see. Using Subversion trunk_at_35072:
>
> [[[
> $ svn st -u
> * 35072 www/tools_contrib.html
> * 35072 subversion/include/svn_auth.h
> * 35072 subversion/include/svn_cmdline.h
> * contrib/hook-scripts/require-mergeinfo.pl
> * 35072 contrib/hook-scripts
> ? fix-bdb-detection-1.patch
> ? diff-35017-35021
> * 35072 TODO-1.6
> Status against revision: 35082
> ]]]
>
> - Julian
>
>
>> 2008/11/22 <stsp_at_tigris.org>:
>> > Author: stsp
>> > Date: Fri Nov 21 12:27:55 2008
>> > New Revision: 34318
>> >
>> > Log:
>> > * subversion/svn/main.c
>> > (svn_opt_subcommand_desc2_t): Document the new tree conflict
>> > output of 'svn status' in 'svn help status'.
>> >
>> > Modified:
>> > trunk/subversion/svn/main.c
>> >
>> > Modified: trunk/subversion/svn/main.c
>> > URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=34318&r1=34317&r2=34318
>> > ==============================================================================
>> > --- trunk/subversion/svn/main.c Fri Nov 21 11:24:59 2008 (r34317)
>> > +++ trunk/subversion/svn/main.c Fri Nov 21 12:27:55 2008 (r34318)
>> > @@ -851,6 +851,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
>> > " Seventh column: Whether the item is the victim of a tree conflict\n"
>> > " ' ' normal\n"
>> > " 'C' tree-Conflicted\n"
>> > + " If the item is a tree conflict victim, an additional line is printed\n"
>> > + " after the item's status line, explaining the nature of the conflict.\n"
>> > "\n"
>> > " The out-of-date information appears in the ninth column (with -u):\n"
>> > " '*' a newer revision exists on the server\n"
>> > @@ -878,7 +880,13 @@ const svn_opt_subcommand_desc2_t svn_cl_
>> > " * 965 922 sussman wc/foo.c\n"
>> > " A + 965 687 joe wc/qax.c\n"
>> > " 965 687 joe wc/zig.c\n"
>> > - " Status against revision: 981\n"),
>> > + " Status against revision: 981\n"
>> > + "\n"
>> > + " svn status\n"
>> > + " M wc/bar.c\n"
>> > + " ! C wc/qaz.c\n"
>> > + " > incoming edit, local missing\n"
>> > + " D wc/qax.c\n"),
>> > { 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
>> > opt_ignore_externals, opt_changelist} },
>> >
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
>> > For additional commands, e-mail: svn-help_at_subversion.tigris.org
>> >
>> >
>>
>
>
Received on 2009-01-08 17:23:51 CET

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