Re: What does 'G' mean in the second column of svn up

On Wednesday 15 October 2003 21:43, Hensley, Richard wrote:
> I'm doing a svn up command on my working copy, and the second column
> show's a 'G'. I made a large number of property updates to the
> respository, so I'm certain it has to do with that. I've looked in the
> book under svn stat and svn up, but neither seem to tell me what the 'G'
> means.
>
> Did I miss something in the documentation?

Yes, you missed 'svn help up', where it says:

For each updated item a line will start with a character reporting the
  action taken. These characters have the following meaning:

    A Added
    D Deleted
    U Updated
    C Conflict
    G Merged

  A character in the first column signifies an update to the actual file,
  while updates to the file's props are shown in the second column.

So I guess you got a property merge then...

Michael Suess

--
"What we do in life, echos in eternity..."
Michael Suess
Public PGP key: http://www.suessnetz.de/michael/michaelsuess.gpg
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org