You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Robert P. J. Day" <rp...@crashcourse.ca> on 2008/09/24 16:56:25 UTC
where are possible merge outcomes documented?
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.
rday
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: where are possible merge outcomes documented?
Posted by Tyler Roscoe <ty...@cryptio.net>.
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
1.5.2:
...
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
...
hth,
tyler
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Fwd: Re: where are possible merge outcomes documented?
Posted by eg <eg...@gmail.com>.
---------- Forwarded message ----------
From: <Pa...@dell.com>
Date: Wed, Sep 24, 2008 at 5:43 PM
Subject: RE: Re: where are possible merge outcomes documented?
To: egoots@gmail.com
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.ref.svn.c.update
may be more relevant. "G" is one possible response for a merge for
the same reason as it is for "svn update" but it isn't a code that
appears on "svn status".
paul
-----Original Message-----
From: eg [mailto:egoots@gmail.com]
Sent: Wednesday, September 24, 2008 8:31 PM
To: Robert P. J. Day
Cc: users@subversion.tigris.org
Subject: Re: where are possible merge outcomes documented?
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.
>
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.ref.svn.c.status
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: where are possible merge outcomes documented?
Posted by eg <eg...@gmail.com>.
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.
>
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.ref.svn.c.status
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org