开发者

Mercurial: diff file

I'm actually trying something simple, but I get strange results:

I want to compare the current version of a file with a specific revision.

In NetBeans 6.9.1 I didn't find any such function. I can only call the history and then diff between successive revisions. Am I missing something?

I tried with the command line tool (Linux): hg diff --rev 527 pom.xml

But I get:

diff -r 1018d7890ea1 pom.xml

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/pom.xml Sun Jan 30 22:45:28 2011 +0000开发者_运维技巧

@@ -0,0 +1,167 @@

+


followed only by "+" lines.

How can I get the diff I want? How can I get this diff with NetBeans (or otherwise with another graphical diff tool)?


You usage of the command-line tool looks correct. However the output

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

Indicates that the file you want to diff did not yet exist in the revision you chose.

Addendum:

In the comments you mention the file was renamed and you need to use -g

You can enable -g for all diffs by adding:

[diff]
git=1

to your .hgrc file (usually located in your home directory)


hg diff -r revision1:revision2 file

Where revision1 and revision2 can be a tag, changeset etc.

By default, your revision2 should be "tip" (without quotes) if you want to compare a revision to the current one.

0

上一篇:

下一篇:

精彩评论

暂无评论...
验证码 换一张
取 消

最新问答

问答排行榜