svn status 'G'?

Hello All,

While working on our port of the subversion command line to the IBM
iSeries I noticed that svn status --help indicates that it's possible for
a WC item to have a status of 'G':

  svn status --help
  status (stat, st): Print the status of working copy files and
directories.
  usage: status [PATH...]

    With no args, print only locally modified items (no network access).
    With -u, add working revision and server out-of-date information.
    With -v, print full revision information on every item.

    The first six 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
        .
        .
        .

'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?

_______________________
Paul Burba

Software Developer
SoftLanding Systems, Inc.

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
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:03:04 2005