hg diff whitespace options do not work. Bug?

Joachim Banzhaf joachimbanzhaf at compuserve.de
Mon Jul 9 12:29:24 CDT 2007


Hi,

Let me start this way: Great tool. Thanks a lot!

Maybe I can help making it even better?
As you can see in the examples below, I diff two versions of a trivial textfile created with vim.
The new version has an extra space in one line and an additional empty line.
Those whitespace differences are always shown by hg diff, regardles of given whitespace options.

I'm quite new to mercurial, so please forgive me if this is a known issue, but
Google, the bugtracker and the normal ML (dev-ML is not searchable) gave some similar problems, but not the same and for older versions of mercurial, mostly marked as resolved.
Nothing between 0.9.3 and tip.

Please contact me, if you need the (tiny) repo or have questions, or if I can test something.


I currently work with this version (sorry, not the all new 0.9.4. No rpm yet):

joachim at job4 ~/difftest
$ hg version
Mercurial Distributed SCM (version 0.9.3)

Copyright (C) 2005, 2006 Matt Mackall <mpm at selenic.com>
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

joachim at job4 ~/difftest
$ rpm -qa | grep merc
mercurial-0.9.3-3.1

joachim at job4 ~/difftest
$ cat /etc/SuSE-release 
openSUSE 10.2 (i586)
VERSION = 10.2

joachim at job4 ~/difftest
$ hg diff -wbB
diff -r 6ff186ee5e69 difftest.txt
--- a/difftest.txt      Mon Jul 09 18:45:50 2007 +0200
+++ b/difftest.txt      Mon Jul 09 18:46:20 2007 +0200
@@ -1,4 +1,5 @@ hallo
 hallo
-  hallo
+   hallo
+
     hallo
 
joachim at job4 ~/difftest
$ hg diff -B
diff -r 6ff186ee5e69 difftest.txt
--- a/difftest.txt      Mon Jul 09 18:45:50 2007 +0200
+++ b/difftest.txt      Mon Jul 09 18:46:20 2007 +0200
@@ -1,4 +1,5 @@ hallo
 hallo
-  hallo
+   hallo
+
     hallo
 
joachim at job4 ~/difftest
$ hg diff -b
diff -r 6ff186ee5e69 difftest.txt
--- a/difftest.txt      Mon Jul 09 18:45:50 2007 +0200
+++ b/difftest.txt      Mon Jul 09 18:46:20 2007 +0200
@@ -1,4 +1,5 @@ hallo
 hallo
-  hallo
+   hallo
+
     hallo
 
joachim at job4 ~/difftest
$ hg diff -w
diff -r 6ff186ee5e69 difftest.txt
--- a/difftest.txt      Mon Jul 09 18:45:50 2007 +0200
+++ b/difftest.txt      Mon Jul 09 18:46:20 2007 +0200
@@ -1,4 +1,5 @@ hallo
 hallo
-  hallo
+   hallo
+
     hallo




More information about the Mercurial-devel mailing list