[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 10:00:23 CEST

On May 26, 2005, at 4:45 PM, Blair Zajac wrote:

> Stephen Davis wrote:
>
>> On May 26, 2005, at 2:36 PM, Michael L Brown wrote:
>>
>>> Andy McCarty <mccarw@lom.med.va.gov
>>> <mailto:mccarw@lom.med.va.gov>> wrote on 05/26/2005 04:18:11 PM:
>>>
>>>
>>>> * Paul Burba <PaulB@softlanding.com
>>>> <mailto: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?
>>>>>
>
> I don't believe you'll see a G from the status command, so I'm
> wondering if this is a docoumentation mistake. Doing what you'd
> think would show a merged file shows M.
>
> $ svn co -r 14800 http://svn.collab.net/repos/svn/trunk/notes
> $ cd notes
> $ echo "some change" >> l10n-problems
> $ svn status
> M l10n-problems
> $ svn update
> G l10n-problems
> Updated to revision 14856.
> $ svn status
> M l10n-problems

svn status is local only, it does not contact the repository so it
can't possibly tell you if a file will be merged. However, it looks
like you are right b/c "svn status -u" will show you something like:

M * 14856 10n-problems

to tell you the file is locally modified AND there is a pending
update to be merged. It does not show a G for status ops, or so it
seems in my simple test.

stephen
Received on Fri May 27 10:02:27 2005

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