On Jan 20, 2011, at 12:01 , Steve Cohen wrote:
> On 01/20/2011 04:28 AM, JamieEchlin wrote:
>>
>>
>> Stephen Butler wrote:
>>>
>>> On the command line, try
>>>
>>> svn help update
>>>
>>> (for instance).
>>>
>>> It's also in the SVN Book's command reference chapter, under
>>> the given 'svn' subcommand:
>>>
>>
>> There is docn for the letters for status and for update, but I haven't found
>> anything for the output from merge, which have subtle differences from the
>> above two.
>>
>> cheers, jamie
>
> exactly my point. It isn't documented for merge. In my google searches I
> ran across a post where someone complained about this in 2007.
You're right. This oversight has been corrected for 1.7. For the
record, here's what it says (as of r1060460):
[[[
For each merged item a line will be printed with characters reporting
the action taken. These characters have the following meaning:
A Added
D Deleted
U Updated
C Conflict
G Merged
E Existed
R Replaced
Characters in the first column report about the item itself.
Characters in the second column report about properties of the item.
A 'C' in the third column indicates a tree conflict, while a 'C' in
the first and second columns indicate textual conflicts in files
and in property values, respectively.
]]]
Regards,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
