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

Re: where are possible merge outcomes documented?

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Wed, 24 Sep 2008 15:21:08 -0700

On Wed, Sep 24, 2008 at 12:56:25PM -0400, Robert P. J. Day wrote:
> i've perused the book and i have yet to see a concise summary of
> the possible outcomes for doing a merge -- that is, a one-line
> explanation of each of the possible letters, 'A', 'M', 'D', 'C' and so
> on.
> i don't see a table/list like that in the merging sections of the
> book, and neither are they documented in "svn help merge". and that
> strikes me as fairly important information.

I can't comment as to whether there's a better place to put this
information, but it is available to me by running "svn help status" on

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
      'I' Ignored
      'M' Modified
      'R' Replaced
      'X' item is unversioned, but is used by an externals definition
      '?' item is not under version control
      '!' item is missing (removed by non-svn command) or incomplete
      '~' versioned item obstructed by some item of a different kind


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-25 00:21:29 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.