MS Word 将打开一个比较结果 Word 文档，该文档将显示文档当前版本与先前版本之间的差异作为“跟踪更改”。
Yes.
You will be able to do meaningful diffs for MS Word documents.
If you have TortoiseHg installed and you have set up a repository, right-click the file for which you want to check the diffs.
On the context menu, click TortoiseHg > Visual Diffs.
In the Visual Diffs dialog, select docdiff, instead of kdiff3.
Double-click the file in the Visual Diffs dialog.
MS Word will open a Compare Result Word document, which will show the differences between the current version of the document and the previous version as Tracked Changes.
Mercurial generally makes no assumptions about file contents. Thus, most things in Mercurial work fine with any type of file.
Mercurial stores a binary diff regardless of the file type. The problem with PDF/Word files is that a little change to them usually causes a huge difference in their binary representation on disk. .docx Documents are stored as a zipped xml, due to the zipping a single flipped bit inside the archive can cause the zip archive to look completely different.
If you don't grow your repository too large, you probably won't experience any issues using Mercurial.
cmd.pdfdiff = [\path\to\diffpdf.exe]
opts.pdfdiff= -a $local $other
$local and $other have no meaning in the extdiff context. The literal strings "$local" and "$other", not the file names, will be passed to "diffpdf.exe". I found this the hard way.
cmd.pdfdiff = [\path\to\diffpdf.exe]
opts.pdfdiff= -a
Each custom diff commands can have two parts: a 'cmd' and an 'opts' part. The cmd.xxx option defines the name of an executable program that will be run, and opts.xxx defines a set of command-line options which will be inserted to the command between the program name and the files/directories to diff
对于 Pdf 文件，我能够获得 GPL 许可 DiffPDF 连接起来，以便在修订版之间进行比较pdf 文件。
我将以下内容添加到我的 mercurial.ini 文件中：
[extdiff]
cmd.pdfdiff = [\path\to\diffpdf.exe]
opts.pdfdiff= -a $local $other
[diff-patterns]
**.pdf=pdfdiff
现在，当我单击 tortoisehg 中的 pdf 文件（或在 cmd 行使用 hg pdfdiff）时，它会打开两个用于比较的文件。由于我的 pdf 往往包含图像，因此我使用外观比较器（opts 中的-a）。如果您主要有文本，则可以使用 -w 代替。
它默认突出显示以显示差异。我更喜欢使用 Src Xor Dest 选项来显示差异，但我不认为有这样的命令行选项。
For Pdf files, I was able to get the GPL licensed DiffPDF hooked up to do comparisons between revisions of pdf files.
I added the following to my mercurial.ini file:
[extdiff]
cmd.pdfdiff = [\path\to\diffpdf.exe]
opts.pdfdiff= -a $local $other
[diff-patterns]
**.pdf=pdfdiff
Now when I click on the pdf file in tortoisehg (or use hg pdfdiff at the cmd line), it opens the two files for comparison. Since my pdf's tend to contain images, I use the appearance comparer (-a in opts). If you have mostly text, you can use -w instead.
It defaults to highlighting to show the diffs. I prefer the Src Xor Dest option for displaying the differences, but I don't think there is a cmd line option for that.
发布评论
评论（4）
是的。
您将能够对 MS Word 文档进行有意义的比较。
如果您安装了 TortoiseHg 并且
您已经设置了一个存储库，
右键单击您要查找的文件
想要检查差异。
在上下文菜单中，单击 TortoiseHg >视觉差异。
在“视觉差异”对话框中，选择
docdiff，而不是 kdiff3。
双击视觉中的文件
“差异”对话框。
MS Word 将打开一个比较结果 Word 文档，该文档将显示文档当前版本与先前版本之间的差异作为“跟踪更改”。
Yes.
You will be able to do meaningful diffs for MS Word documents.
If you have TortoiseHg installed and
you have set up a repository,
right-click the file for which you
want to check the diffs.
On the context menu, click TortoiseHg > Visual Diffs.
In the Visual Diffs dialog, select
docdiff, instead of kdiff3.
Double-click the file in the Visual
Diffs dialog.
MS Word will open a Compare Result Word document, which will show the differences between the current version of the document and the previous version as Tracked Changes.
是的，但是您当然无法以任何有意义的方式进行差异。因此，这些文件在合并期间将被视为二进制文件。
Mercurial 完全能够跟踪二进制文件：
无论文件类型如何，Mercurial 都会存储二进制差异。 PDF/Word 文件的问题在于，对它们进行一点点更改通常会导致它们在磁盘上的二进制表示形式出现巨大差异。
.docx文档存储为压缩的 xml，因为压缩存档内的单个翻转位可能会导致 zip 存档看起来完全不同。如果您不将存储库增长得太大，那么使用 Mercurial 可能不会遇到任何问题。
Yes, but of course you won't be able to diff in any meaningful way. The files will therefore be treated as binary during merges.
Mercurial is perfectly capable of tracking binary files:
Mercurial stores a binary diff regardless of the file type. The problem with PDF/Word files is that a little change to them usually causes a huge difference in their binary representation on disk.
.docxDocuments are stored as a zipped xml, due to the zipping a single flipped bit inside the archive can cause the zip archive to look completely different.If you don't grow your repository too large, you probably won't experience any issues using Mercurial.
请注意，建议的
$local 和 $other 在 extdiff 上下文中没有任何意义。文字字符串“$local”和“$other”（而不是文件名）将传递给“diffpdf.exe”。我发现这很困难。
将起作用，两个文件将作为“-a”后面的参数传递。 cf https://www.mercurial-scm.org/wiki/ExtdiffExtension 其中指出：
Beware the suggested
$local and $other have no meaning in the extdiff context. The literal strings "$local" and "$other", not the file names, will be passed to "diffpdf.exe". I found this the hard way.
will work and the two files will be passed as parameters following the "-a". c.f. https://www.mercurial-scm.org/wiki/ExtdiffExtension where it is stated:
对于 Pdf 文件，我能够获得 GPL 许可 DiffPDF 连接起来，以便在修订版之间进行比较pdf 文件。
我将以下内容添加到我的
mercurial.ini文件中：现在，当我单击 tortoisehg 中的 pdf 文件（或在 cmd 行使用
hg pdfdiff）时，它会打开两个用于比较的文件。由于我的 pdf 往往包含图像，因此我使用外观比较器（opts中的-a）。如果您主要有文本，则可以使用-w代替。它默认突出显示以显示差异。我更喜欢使用 Src Xor Dest 选项来显示差异，但我不认为有这样的命令行选项。
For Pdf files, I was able to get the GPL licensed DiffPDF hooked up to do comparisons between revisions of pdf files.
I added the following to my
mercurial.inifile:Now when I click on the pdf file in tortoisehg (or use
hg pdfdiffat the cmd line), it opens the two files for comparison. Since my pdf's tend to contain images, I use the appearance comparer (-ainopts). If you have mostly text, you can use-winstead.It defaults to highlighting to show the diffs. I prefer the Src Xor Dest option for displaying the differences, but I don't think there is a cmd line option for that.