cmpilato@localhost.localdomain wrote on 05/26/2005 08:00:11 PM:
> Blair Zajac <blair@orcaware.com> writes:
>
> > [forwarding a discussion started on the users mailing list].
> >
> > Anybody know the circumstances that a 'G' can be printed from svn
> > status? The 'svn help status' from 1.1.4 shows one:
> >
> > $ svn help status
> > ..
> > ..
> > The first five columns in the output are each one character wide:
> > First column: Says if item was added, deleted, or otherwise
changed
> > ' ' no modifications
> > 'A' Added
> > 'C' Conflicted
> > 'D' Deleted
> > 'G' Merged
> >
> >
> > but I can't think of when it would be generated and the book's
> > ch03.xml doesn't show it either.
> >
> > Documentation mistake in the code???
>
> I certainly can't think of a time when G would show up, either. 'svn
> blame subversion/clients/cmdline/main.c' ?
>
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"
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 27 17:07:42 2005