svn合并输出的不同列（字母）是什么意思？(What do the different columns (of letters) mean for the svn merge output?)

svn合并输出的不同列（字母）是什么意思？(What do the different columns (of letters) mean for the svn merge output?)

SVN合并的输出在文件名前列出4列字母。 我理解字母的含义（主要是），但是我找不到列的含义的任何信息，因此只有基于上下文的模糊的理解。 任何人都可以指出这个文件吗？

基于上下文，我已经能够推断该列：

关于文件的更改 似乎与文件夹上使用svn ignore命令有关（或者也可能只是文件的属性）？ 我从来没有在第三栏看到一封信，所以我不知道这是什么意思。 可能是树冲突？ 这是我最担心的，因为我不知道如何处理它。

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:

Is about text changes to a file Seems to be related to use of the svn ignore command on a folder (or maybe it's just properties of the file?) I've never seen a letter in the third column and hence I have no idea what it means. Might be tree conflicts? This is the one I'm mostly worried about because I don't know how to handle it yet.

最满意答案

詹姆斯，我有同样的问题 - 非常沮丧没有找到详细的“svn合并”信息; 然而，在我的谷歌搜索我发现这个帖子： http : //svn.haxx.se/users/archive-2008-06/0813.shtml

它表示“svn merge”状态字符与实际记录的“svn update”状态字母相同。 从“svn help update”命令：

对于每个更新的项目，一行将以报告所采取的操作的角色开始。 这些字符具有以下含义：

A Added D Deleted U Updated C Conflict G Merged

第一列中的一个字符表示对实际文件的更新，而文件属性的更新显示在第二列中。 第三列中的“B”表示文件的锁已被破坏或被盗。

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.