svn:如何查看两个修订版之间更改了哪些文件(忽略中间版本)

发布于 2024-11-30 05:26:03 字数 549 浏览 2 评论 0原文

我的项目分支有以下历史记录:

  • 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 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(4

遗心遗梦遗幸福 2024-12-07 05:26:03

您可以执行以下操作:

svn diff -r 3780:3805 .

假设您位于要执行此操作的目录。

You can do:

svn diff -r 3780:3805 .

Assuming you are at the directory where you would like to perform this.

别再吹冷风 2024-12-07 05:26:03

尝试使用 svn diff -r 3780:3805 http://url_of_your_branch

Try with svn diff -r 3780:3805 http://url_of_your_branch

浮光之海 2024-12-07 05:26:03

您考虑过以下几点吗?

  1. 签出3780,然后导出临时目录A中的内容。
  2. 签出3805,然后导出临时目录B中的内容。
  3. 使用windiff(或等效工具)比较A和B?

Did you consider the following?

  1. Check-out 3780, then export content in a temporary directory A.
  2. Check-out 3805, then export content in a temporary directory B.
  3. Use windiff (or equivalent) to compare A and B?
彩扇题诗 2024-12-07 05:26:03

要回答原来的问题,如果您想查看文件列表而不是所有差异详细信息:

svn diff --summarize -r 3780:3805 [target]

To answer the original question, if you want to see the list of files and not all the diff details:

svn diff --summarize -r 3780:3805 [target]
~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文