[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: Marc Sherman <msherman_at_projectile.ca>
Date: 2005-05-26 23:16:24 CEST

Paul Burba wrote:
>
> '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?

http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4

> The U and G codes are no cause for concern; those files cleanly
> absorbed changes from the repository. The files marked with U
> contained no local changes but were Updated with changes from the
> repository. The G stands for merGed, which means that the file had
> local changes to begin with, but the changes coming from the
> repository didn't overlap with the local changes.

- Marc

---------------------------------------------------------------------
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:20:35 2005

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