[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: Patrick Burleson <pburleson_at_gmail.com>
Date: 2005-05-26 23:42:37 CEST

On 5/26/05, Andy McCarty <mccarw@lom.med.va.gov> wrote:
> * 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'.
>
>
> --
> Andy
>

Is that true in the context of a "svn status". Until you commit, would
it continue to report that your local changes were merged with changes
from the server? I guess that would make sense. Just to keep you
alerted that the file has outside changes in it.

Patrick

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 26 23:44:16 2005

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