使用 TortoiseHg 跨多个提交进行代码审查的最佳方法是什么?

发布于 2024-10-15 18:02:54 字数 287 浏览 3 评论 0原文

我遇到的问题是我需要进行一些代码审查,每次审查大约有 10 次提交。这是一个活跃的存储库,开发人员不断提交。我让 TortoiseHg 过滤我的变更集,以便我只查看我关心的变更集。

我想看到的是第一次更改之前的更改集与最后一次更改之前的更改集之间的差异(没有显示所有不相关的更改集)。我只是想看看所有这些改变的最终结果。我不在乎变更集 1 中有一些可怕的代码,这些代码在变更集 3 中得到了修复。我只是想看看所有这些变更集最终合并的内容的差异。

我觉得我错过了显而易见的事情,这不是一个明智的问题。尽管如此,我还是要问。有人吗?

The problem that I'm running into is that I have some code reviews to do, with ~10 commits per review. It's an active repo with constant commits from developers. I have TortoiseHg filtering my changesets so that I am looking only at the ones that I care about.

What I would like to see is the difference between the changeset before the first change, and the last (without all the non-related changesets showing). I simply want to see the final results of all these changes. I don't care that there was some horrible code in changeset 1, that was fixed in 3. I just want to see the diff of what ultimately got merged through all these changesets.

I feel like I'm missing the obvious, and this isn't a bright question. Nevertheless, I'm asking anyways. Anyone?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

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

发布评论

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

评论(2

冷心人i 2024-10-22 18:02:54

我不确定 1.1.8,因为我使用的是 1.9/2.0 候选版本,但我相信您可以左键单击 Changeset1,右键单击 revision3 并选择 Visual Diff。这应该会打开您选择的差异工具,并且仅显示两个版本之间的差异。

当我在较新的乌龟中执行此操作时,它以目录比较模式打开BeyondCompare,一侧为修订版1,另一侧为修订版2。

I'm not sure about 1.1.8, as I'm using the 1.9/2.0 candidate release, but I believe you could left-click on changeset1, right-click on revision3 and select visual Diff. This should open your diff tool of choice and only show you the diffs between the 2 versions.

When I did this in the newer tortoise, it opened BeyondCompare in directory compare mode, with revision1 on one side, and revision2 on the other.

狼性发作 2024-10-22 18:02:54

不要在提交之间合并,并在开始和完成变更集之间区分开发人员克隆。

或者,如果发生合并,请更新并合并所有内容,然后获取整个代码库(或刚刚更改的文件)并将其转储到干净的提示克隆上(确保您使用的是相同版本以避免覆盖任何内容)。立即重新提交所有内容。

Don't merge in between commits and diff off the developers clone between start and finish changesets.

Or If merges occured, update and merge everything and then take the entire codebase (or just changed files) and dump it onto a clean tip clone (make sure you are working with the same version to avoid overwriting anything). Recommit all at once.

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