You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2005/05/26 23:48:35 UTC

[Fwd: Re: svn status 'G'?]

[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???

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<bl...@orcaware.com>
Subversion and Orca training and consulting
http://www.orcaware.com/svn/

Re: [Fwd: Re: svn status 'G'?]

Posted by "C. Michael Pilato" <cm...@collab.net>.
Blair Zajac <bl...@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' ?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org