当我将主干分支与我的分支合并以获取最新更改后,我将我的分支合并到主干分支中。然后进行了svn st操作,以下是其中一部分输出结果,让我感到困惑:
R + path/to/dirA
M path/to/dirB
我还为我添加的目录获得了“A”状态,这一点我理解。但是,我不理解上面的状态,尤其是这些目录没有进行任何更改。当我对其中一个目录执行svn diff时,我收到了“路径/到/dirA上的属性更改”的代码提示。
当我将主干分支与我的分支合并以获取最新更改后,我将我的分支合并到主干分支中。然后进行了svn st操作,以下是其中一部分输出结果,让我感到困惑:
R + path/to/dirA
M path/to/dirB
svn help status
实际上非常好。
我将粘贴相关片段:
"
First column: Says if item was added, deleted, or otherwise changed
' ' no modifications
'A' Added
'C' Conflicted
'D' Deleted
'I' Ignored
'M' Modified
'R' Replaced
'X' an unversioned directory created by an externals definition
'?' item is not under version control
'!' item is missing (removed by non-svn command) or incomplete
'~' versioned item obstructed by some item of a different kind
Second column: Modifications of a file's or directory's properties
' ' no modifications
'C' Conflicted
'M' Modified
Fourth column: Scheduled commit will contain addition-with-history
' ' no history scheduled with commit
'+' history scheduled with commit
Seventh column: Whether the item is the victim of a tree conflict
' ' normal
'C' tree-Conflicted
第一个方法是将目录替换为副本(或移动)。例如:svn rm path/to/dirA
svn cp path/to/someOtherDir path/to/dirA