The output of SVN merge has 4 columns of letters listed before the file name. I understand the meaning of the letters (mostly) but I can't find any information on the meanings of the columns and so only have a vague understanding based on context. Can anyone point me to the documentation on this?
Based on context I've been able to infer that column:
D: This file will be deleted (after commit) S: This signifies that the file or directory has been switched from the path of the rest of the working copy (using svn switch) to a branch.
'M' Item has been modified. 'R' Item has been replaced in your working copy. This means the file was scheduled for deletion, and then a new file with the same name was scheduled for addition in its place.
James, I had the same issue - very frustrating not finding detailed "svn merge" info; however, in my google searches I found this posting: http://svn.haxx.se/users/archive-2008-06/0813.shtml
It indicates that the "svn merge" status letters are identical to the "svn update" status letters, which are actually documented. From the "svn help update" command:
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
A character in the first column signifies an update to the actual file, while updates to the file's properties are shown in the second column. A 'B' in the third column signifies that the lock for the file has been broken or stolen.
Same information but from official source:
http://subversion.apache.org/docs/svn-merge.txt
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.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With