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

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

From: Blair Zajac <blair_at_orcaware.com>
Date: 2005-05-27 01:48:35 CEST

[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.
<blair@orcaware.com>
Subversion and Orca training and consulting
http://www.orcaware.com/svn/

attached mail follows:


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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 27 01:49:21 2005

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