You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Mitch Claborn <mi...@claborn.net> on 2008/02/21 16:31:44 UTC
merge status codes
When I do "svn merge", it lists in the leftmost column a status or
action code. Anyone know where there are documented? I'm particularly
interested in what "G" means.
--
Mitch Claborn
mitch@claborn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge status codes
Posted by Carsten Koch <Ca...@icem.com>.
Mitch Claborn wrote:
> When I do "svn merge", it lists in the leftmost column a status or
> action code. Anyone know where there are documented?
I tried "svn merge -h".
Unlike "svn status -h" it does not list the status codes.
And the status codes from "svn status" do not help, because
they do not document what "U" and "G" means.
I searched the entire svn book for occurences of "svn merge",
but none of them explained the merge status codes.
Finally, I tried "svn update -h".
That one does says
For each updated item a line will start with a character reporting the
action taken. These characters have the following meaning:
A Added
D Deleted
U Updated
C Conflict
G Merged
Those look like the codes also used by "svn merge",
but how can I be sure?
I believe it must be a bug that "svn merge -h" does not list the codes.
Carsten.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge status codes
Posted by Erik Huelsmann <eh...@gmail.com>.
On 2/21/08, Mitch Claborn <mi...@claborn.net> wrote:
> When I do "svn merge", it lists in the leftmost column a status or
> action code. Anyone know where there are documented? I'm particularly
> interested in what "G" means.
"G" means "merGed", meaning that your base versions of the merge and
the one in the working copy were not the same and it applied the
difference between the merge-base and merge-endpoint to the working
copy (the merge target).
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org