Accurev 中的 diff 与 basic 和 backing 之间有什么区别

发布于 2024-10-14 01:59:24 字数 35 浏览 2 评论 0原文

Accurev 中与基础的差异和与支持的差异有什么区别?

What is the difference between diff against basis and diff against backing in Accurev?

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

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

发布评论

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

评论(1

红墙和绿瓦 2024-10-21 01:59:24

我从您在本论坛中的其他帖子中假设,这里的上下文将是在您的工作区中根据 Backed 或 Basis 对文件进行比较。

与基础进行比较将在进行更改之前将您工作区中当前拥有的文件与您开始使用的版本进行比较。一个例子是,您更新工作区,开始处理处于(支持)状态的 foo.c,对其进行一些修改,然后针对 Basis 运行 Diff。它会将您的修改与开始时的版本进行比较,无论父流中现在可能存在哪些更改。。也就是说,它只会向您显示与您的工作相关的更改。

Diff against Backed 会将您工作区中当前的文件与当前支持流或父流中的文件进行比较。使用前面的示例,您对 foo.c 进行了修改,但自您开始工作以来,另一个开发人员也已将自己对 foo.c 的更改提升到父流中。针对 Backed 运行 Diff 会将您当前的文件与父流中的文件进行比较,因此您还将与其他开发人员的更改进行比较,本质上是查看预合并。

如果没有其他人对 foo.c 进行更改,则针对 Backed 的 Diff 和针对 Basis 的 Diff 将产生相同的结果。

最后,对于任何给定的文件,您可以运行 History ->如果“Backed”或“Basis”不是您要查找的特定比较,则浏览版本并比较曾经存在的任何两个版本。

希望这有帮助,
〜詹姆斯

I assume from your other posts in this forum that the context here would be in doing a diff of a file in your workspace against either Backed or Basis.

Diff against Basis is going to compare the file you currently have in your workspace with the version that you starting working with prior to making your changes. An example would be, you update your workspace, begin working on foo.c that is (backed) status, make several modifications to it and then run Diff against Basis. It will compare your modifications to the version you began with, regardless of what changes might now be in the parent stream. That is, it will show you only changes pertaining to your work.

Diff against Backed is going to compare the file you currently have in your workspace with the one that is currently in your backing - or parent -stream. Using the previous example, you have your modifications to foo.c but also another developer has promoted their own changes to foo.c into the parent stream since you began working. Running a Diff against Backed will compare your current file to the one in the parent stream, thus you will also be comparing against the other developer's changes, essentially viewing a pre-merge.

If no one else has made changes to foo.c, then Diff against Backed and Diff against Basis would yield the same result.

Lastly, for any given file, you can run History -> Browse Versions and diff any two versions that have ever existed if Backed or Basis isn't the specific compare you're looking for.

Hope this helps,
~James

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