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

前端 未结 6 727
生来不讨喜
生来不讨喜 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:29

    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.
    

提交回复
热议问题