What do the different columns (of letters) mean for the svn merge output?

前端 未结 6 743
生来不讨喜
生来不讨喜 2021-02-01 02:20

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 m

6条回答
  •  悲&欢浪女
    2021-02-01 02:30

    Execute this command to get the definitions of these values: svn update --help

    This is excepted from the output of that command:

    For each updated 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 'B' in the third column signifies that the lock for the file has been broken or stolen. A 'C' in the fourth column indicates a tree conflict, while a 'C' in the first and second columns indicate textual conflicts in files and in property values, respectively.

提交回复
热议问题