使用svn中的log命令,如何查看在合并文件夹下添加的文件?
我有一个问题,我更改的最外层文件夹被标记为已添加,但在合并过程中其内容被标记为正常。以后在日志中查看此提交时,仅记录为已更改的文件夹,而不是其中的文件:使用svn中的log命令,如何查看在合并文件夹下添加的文件?,svn,Svn,我有一个问题,我更改的最外层文件夹被标记为已添加,但在合并过程中其内容被标记为正常。以后在日志中查看此提交时,仅记录为已更改的文件夹,而不是其中的文件: C:\\>svn log svn://repository/Trunk -r 3:HEAD -v r3 | mangotastic | 2014-05-12 10:11:14 +0100 (Mon, 12 May 2014) | 4 lines M /Trunk/Scripts A /Trunk/Scripts/AutomatedDepl
C:\\>svn log svn://repository/Trunk -r 3:HEAD -v
r3 | mangotastic | 2014-05-12 10:11:14 +0100 (Mon, 12 May 2014) | 4 lines
M /Trunk/Scripts
A /Trunk/Scripts/AutomatedDeploy (from /Branches/NewDevelopment/Scripts/AutomatedDeploy:3)
当遇到这些问题时,我执行了这些确切的步骤:
我正在使用TortoiseSvn进行合并,并使用SharpSvn在监控应用程序中读取合并(尽管我使用log命令看到了相同的问题)。我尝试了类似的方法:
- 创建了一个空白存储库
- 分支到新的分支
- 添加了一个文件夹和2个文件
- 单击添加
- 单击提交。提交消息显示要提交的3个文件-文件夹和两个文件
- 已将工作目录文件夹切换到trunk
- 从分支合并而来李>
- 提交的主干-主干现在合并了这些文件
- 单击日志-可以确认仅显示文件夹
- 查看日志时,所有选项(仅显示受影响的路径、复制/重命名时停止、包括合并的修订)均取消选中,仅显示2个修订(版本1、版本4)
svn log -v --use-merge-history
提供类似于以下内容的日志:
c:\Projects\test1>svn log -v --use-merge-history
------------------------------------------------------------------------
r7 | computa_mike | 2014-05-13 14:32:04 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
M /trunk
A /trunk/New folder2 (from /branches/test2/New folder2:6)
Adding a new folder and file
------------------------------------------------------------------------
r6 | computa_mike | 2014-05-13 13:16:25 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
A /branches/test2/New folder2
A /branches/test2/New folder2/New Text Document.txt
Merged via: r7
test
------------------------------------------------------------------------
r5 | computa_mike | 2014-05-13 13:14:38 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
A /branches/test2 (from /trunk:4)
Merged via: r7
------------------------------------------------------------------------
r4 | computa_mike | 2014-05-13 13:05:07 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
M /trunk
A /trunk/NewFolder (from /branches/test1/NewFolder:3)
Committing changes to these files.
------------------------------------------------------------------------
r3 | computa_mike | 2014-05-13 13:03:46 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
A /branches/test1/NewFolder
A /branches/test1/NewFolder/New Text Document (2).txt
A /branches/test1/NewFolder/New Text Document.txt
Merged via: r4
Committed new folder and files
------------------------------------------------------------------------
r2 | computa_mike | 2014-05-13 13:01:10 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
A /branches/test1 (from /trunk:1)
Merged via: r4
test1 branch created
------------------------------------------------------------------------
r1 | computa_mike | 2014-05-13 12:58:53 +0100 (Tue, 13 May 2014) | 1 line
Changed paths:
A /branches
A /tags
A /trunk
Imported folder structure
------------------------------------------------------------------------
似乎Subversion实际上将文件视为在分支中被更改,并且只记录顶级文件夹的合并。我似乎需要--use merge history标志来访问这些更改。