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

Re: svn status 'G'?

From: Stephen Davis <subversion_at_soundgeek.org>
Date: 2005-05-27 00:39:02 CEST

On May 26, 2005, at 2:36 PM, Michael L Brown wrote:

> Andy McCarty <mccarw@lom.med.va.gov> wrote on 05/26/2005 04:18:11 PM:
>
>> * Paul Burba <PaulB@softlanding.com> [2005-05-26 17:01:18 -0400]:
>>
>>>
>>> 'G' obviously makes sense as feedback from svn update, but I'm at a
>>>
> loss
>
>>> to figure out under what scenario svn status would produce it...any
>>> thoughts?
>>
>> If you have a locally modified file but there is a new
>> revision in the repository 'svn up' will attempt to
>> merge the repo version with the local mods. Hence
>> the 'G'.
>>
>
> My idiotic question is why "G?" All of the others are the first
> letter of
> the
> word, yet Merged doesn't use "M," it uses "G."

Because 'M' is used for locally modified and CVS lumped the two
states together ('locally modified' and 'needs merge') and it drives
everyone crazy so the Subversion developers decided not to make the
same mistake? :-)

stephen
Received on Fri May 27 00:40:39 2005

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