You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Daniel L. Rall" <dl...@finemaltcoding.com> on 2005/05/28 01:55:40 UTC
Can 'svn status' output ' C'?
On Fri, 2005-05-27 at 16:34 -0700, Daniel L. Rall wrote:
> On Fri, 2005-05-27 at 11:06 -0400, Paul Burba wrote:
> ...
> > It appears this was mistakenly(?) added in rev 8660. Assuming there
> > is no reason for it, here is my humble patch to remove it.
> >
> > Paul B.
> >
> > [[[
> > Remove mention of 'G' Merged from svn status --help.
> >
> > svn status will never show status 'G' in column 1.
> >
> > * subversion/clients/cmdline/main.c
> > (svn_cl__cmd_table): Remove mention of 'G' as an option for the first
> > column.
> > ]]]
> >
> > Index: main.c
> > ===================================================================
> > --- main.c (revision 14856)
> > +++ main.c (working copy)
> > @@ -623,7 +623,6 @@
> > " 'A' Added\n"
> > " 'C' Conflicted\n"
> > " 'D' Deleted\n"
> > - " 'G' Merged\n"
> > " 'I' Ignored\n"
> > " 'M' Modified\n"
> > " 'R' Replaced\n"
>
>
> Thanks Paul, committed as r14870.
While looking for other instances of this problem, I noticed that though
the help says that 'svn status' can print ' C' for conflicted property
status, the published version of the book <http://svnbook.red-
bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.3.1> does not reflect this.
subversion/clients/cmdline/status.c:generate_status_code() is capable of
generating a 'C' character for the second column of the status output,
but I did not determine whether subversion/libsvn_wc/status.c would set
svn_wc_status_conflicted for svn_wc_status2_t.prop_status to trigger
that behavior.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Can 'svn status' output ' C'?
Posted by kf...@collab.net.
Philip Martin <ph...@codematters.co.uk> writes:
> "Daniel L. Rall" <dl...@finemaltcoding.com> writes:
> > subversion/clients/cmdline/status.c:generate_status_code() is capable of
> > generating a 'C' character for the second column of the status output,
> > but I did not determine whether subversion/libsvn_wc/status.c would set
> > svn_wc_status_conflicted for svn_wc_status2_t.prop_status to trigger
> > that behavior.
>
> Yes, 'svn status' can output ' C', see prop_tests.py for some
> examples.
Thanks -- fixed in r1378 of svnbook.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Can 'svn status' output ' C'?
Posted by Philip Martin <ph...@codematters.co.uk>.
"Daniel L. Rall" <dl...@finemaltcoding.com> writes:
> subversion/clients/cmdline/status.c:generate_status_code() is capable of
> generating a 'C' character for the second column of the status output,
> but I did not determine whether subversion/libsvn_wc/status.c would set
> svn_wc_status_conflicted for svn_wc_status2_t.prop_status to trigger
> that behavior.
Yes, 'svn status' can output ' C', see prop_tests.py for some
examples.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org