带有 Hg 的 tortoisemerge 报告所有行已更改

发布于 2024-10-19 00:36:11 字数 492 浏览 2 评论 0原文

我想将 TortoiseMerge 与 Mercurial 一起使用来解决冲突，但它报告了 theirs 和 mine 中添加的每一行，就好像它

在我的 Mercurial.ini 中没有正确比较一样：

[ui]
merge = TortoiseMerge

[merge-tools]
TortoiseMerge.executable=C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
TortoiseMerge.args=/mine:$local /theirs:$other /base:$base -o /merged:$output

我正在使用 Hg 1.7.5

发生了什么事？

更新：使用 KDiff 或 BeyondCompare 时，基数始终为空。

谢谢

原文

I'd like to use TortoiseMerge with Mercurial to resolve conflicts, but its reporting every line in theirs and mine as added as though its not comparing properly

here is my mercurial.ini:

[ui]
merge = TortoiseMerge

[merge-tools]
TortoiseMerge.executable=C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
TortoiseMerge.args=/mine:$local /theirs:$other /base:$base -o /merged:$output

I'm using Hg 1.7.5

What's going on?

Update: When using KDiff or BeyondCompare, the base is always empty.

Thanks

分享到QQ

分享到微博

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

发布评论

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

困倦 2024-10-26 00:36:11

您的设置看起来正确。

这是基本修订版中没有文件副本的症状，在这种情况下，Mercurial 的行为就好像该文件存在但为空。

有几种方法可以弄清楚这里发生了什么。如果不涉及副本或重命名，您应该能够简单地执行以下操作：

$ hg log -r "ancestor(p1(), p2())"

..确定合并的祖先，然后：

$ hg manifest -r <rev> | grep <your file>

..确定文件是否确实存在。

或者，您可以运行“hg merge --debug”或“hg update --debug”来查看为合并选择的变更集和文件（包括重命名/复制详细信息）。

如果您发现该文件存在在 Mercurial 选择的共同祖先中，那么您应该在以下位置报告错误（包括调试输出）：

https://www.mercurial-scm.org/wiki/BugTracker

Your setup appears correct.

This is symptomatic of having no copy of the file in the base revision, in which case Mercurial acts as if the file was present but empty.

There are a couple ways of figuring out what's going on here. If there are no copies or renames involved, you should be able to simply do:

$ hg log -r "ancestor(p1(), p2())"

..to determine the ancestor of the merge, then:

$ hg manifest -r <rev> | grep <your file>

..to determine if the file was in fact present.

Alternately, you can run 'hg merge --debug' or 'hg update --debug' to see what changeset and file it's choosing for the merge (including rename/copy details).

If you find that the file is present in the common ancestor Mercurial chooses, then you should report a bug (including your debug output) at:

https://www.mercurial-scm.org/wiki/BugTracker

回复收藏 0 原文

~没有更多了~