不同的列(字母)对 svn 合并输出意味着什么? [英] What do the different columns (of letters) mean for the svn merge output?

问题描述

SVN 合并的输出在文件名之前列出了 4 列字母.我理解字母的含义(大部分)，但我找不到关于列的含义的任何信息，因此只能根据上下文有一个模糊的理解.谁能给我指点一下这方面的文档?

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:

1. 是关于对文件的文本更改
2. 似乎与在文件夹上使用 svn ignore 命令有关(或者它可能只是文件的属性?)
3. 我从未在第三列中看到过字母，因此我不知道它是什么意思.
4. 可能是树冲突?这是我最担心的一个，因为我还不知道如何处理.

推荐答案

James，我遇到了同样的问题 - 没有找到详细的svn merge"信息非常令人沮丧；然而，在我的谷歌搜索中，我发现了这个帖子:http://svn.haxx.se/users/archive-2008-06/0813.shtml

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

这表明svn merge"状态字母与svn update"状态字母相同，实际上是记录在案的.来自svn help update"命令:

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

第一列中的字符表示对实际文件的更新，而对文件属性的更新显示在第二列中.第三列中的B"表示文件的锁具有被损坏或被盗.

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.

这篇关于不同的列(字母)对 svn 合并输出意味着什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！