svn:如何查看两个修订版之间更改了哪些文件(忽略中间版本)
我的项目分支有以下历史记录:
- 3780 - 我所做的更新
- 3803 - 从同事的分支合并
- 3804 - 添加了一些小功能
- 3805 - 在找到同事的分支后,对 3803 进行了反向合并分支有问题
有没有办法让我找出修订版 3780 和 3805 之间更改了哪些文件,不会被以下文件误导变回原来的状态了吗?我试图验证 3780->3805 的净效应是一组相对较小的变化。
例如,如果文件 X.cpp 在 r3803 中更改,然后在 r3805 中更改回与 3780 中相同的状态,则我不需要在差异中看到 X.cpp。
注意:这不与我如何查看两个修订版之间更改了哪些文件?,其答案说明了在开始和结束之间的任何修订版中哪些文件已更改。
I have the following history for my branch of a project:
- 3780 -- an update I did
- 3803 -- merged from a coworker's branch
- 3804 -- added a few minor features
- 3805 -- did a reverse merge of 3803, after finding out the coworker's branch had problems
Is there a way I can find out which files were changed between revision 3780 and 3805, without being misled by files which have changed back to their original state? I am trying to verify that the net effect of 3780->3805 is a relatively small set of changes.
e.g. if file X.cpp changed in r3803 and then changed back in r3805 to the same state as in 3780, I need to not see X.cpp in my diff.
NOTE: This is not the same as How do I see what files were changed between 2 revisions?, the answers of which state which files have been changed in any of the revisions between the start and end.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(4)
您可以执行以下操作:
假设您位于要执行此操作的目录。
You can do:
Assuming you are at the directory where you would like to perform this.
尝试使用
svn diff -r 3780:3805 http://url_of_your_branch
Try with
svn diff -r 3780:3805 http://url_of_your_branch
您考虑过以下几点吗?
Did you consider the following?
要回答原来的问题,如果您想查看文件列表而不是所有差异详细信息:
To answer the original question, if you want to see the list of files and not all the diff details: