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

Re: [BOOK PATCH] svn up 'G' status character

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2004-03-15 16:14:07 CET

Ryan Barrett writes:

> hi subversion gurus! first, ten thousand thanks for subversion. it rocks.
>
> second, i have a humble suggestion for the book. the svn up reference
> doesn't list the 'G' status character, which (from what i can tell) is
> used for files that have local changes which are identical to the changes
> in HEAD. i think this is only applicable to svn up, since a subsequent svn
> st won't list them, as expected.
>
> out of curiosity, what does G stand for here?

merGed.

It means that the update process modified a file that you also had
locally modified, in a way that didn't conflict.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 15 16:15:21 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.