tests/test-mq-qdiff.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Fri, 11 Dec 2009 15:58:09 +0900
changeset 10090 a3ad96ead8f0
parent 9857 24bc6e414610
child 10191 99d285ac5da4
permissions -rw-r--r--
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate stat() is not reliable when several events happen quickly. Which means that if two hg actions occur in the same second, stat() result will not reflect the second change. And only _one_ invalidate() call was done. Also ignore the events that occur when wlock is held, since wlock release will trigger a full rescan anyway. Fixes 17 run-tests.py --inotify tests.

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff filename
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% revert
% qpop
popping mqbase
patch queue now empty
% qdelete mqbase
% commit 2
adding lines
% qnew 2
% qdiff -U 1
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
 1
@@ -4,4 +6,4 @@
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
% qdiff -b
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
 1
 2
 3
 4
 hello world
-goodbye world
+     goodbye world
 7
 8
 9
% qdiff -U 1 -B
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -4,4 +6,4 @@
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
% qdiff -w
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
 1
 2
 3
% qdiff --reverse
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
 1
 2
 3
 4
-hello  world
-     goodbye world
+hello world
+goodbye world
 7
 8
 9