[PATCH] test-log: don't reveal revlink issue
Mads Kiilerich
mads at kiilerich.com
Tue Jul 13 10:19:54 CDT 2010
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1279034359 -7200
# Node ID 12434bb6f9a7e4186c3725504f5b67fb8bb2c0d5
# Parent 647145f9b130063ef4f81cdcbce70efb85ed2741
test-log: don't reveal revlink issue
Test introduced in 8308e4ad3981 was reviewed by Nicolas Dumazet
<nicdumz at gmail.com> who made this drawing and spotted the "incorrect" output of
rev 1 instead of rev 3.
0 | 1 | 2 | 3 | 4
a ------------> b
\
b -> dir/b -------> e
d
We now follow dir/b and expects rev 0, 1 and 2.
(Note that if we follow e then we will also get rev 3 because b gets added to
the set of interesting filenames we are following. That is no problem as long
as we only start in rev 2.)
diff --git a/tests/test-log b/tests/test-log
--- a/tests/test-log
+++ b/tests/test-log
@@ -31,8 +31,10 @@
echo % many renames
hg log -vf e
-echo % log -pf b
-hg log -pf b
+echo % log -pf dir/b
+hg log -pf dir/b
+echo % log -vf dir/b
+hg log -vf dir/b
echo '% log copies with --copies'
hg log -vC --template '{rev} {file_copies}\n'
diff --git a/tests/test-log.out b/tests/test-log.out
--- a/tests/test-log.out
+++ b/tests/test-log.out
@@ -76,7 +76,18 @@
a
-% log -pf b
+% log -pf dir/b
+changeset: 2:41dd4284081e
+user: test
+date: Thu Jan 01 00:00:03 1970 +0000
+summary: c
+
+diff -r 784de7cef101 -r 41dd4284081e dir/b
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
+@@ -0,0 +1,1 @@
++a
+
changeset: 1:784de7cef101
user: test
date: Thu Jan 01 00:00:02 1970 +0000
@@ -99,6 +110,31 @@
@@ -0,0 +1,1 @@
+a
+% log -vf dir/b
+changeset: 2:41dd4284081e
+user: test
+date: Thu Jan 01 00:00:03 1970 +0000
+files: b dir/b
+description:
+c
+
+
+changeset: 1:784de7cef101
+user: test
+date: Thu Jan 01 00:00:02 1970 +0000
+files: b
+description:
+b
+
+
+changeset: 0:8580ff50825a
+user: test
+date: Thu Jan 01 00:00:01 1970 +0000
+files: a
+description:
+a
+
+
% log copies with --copies
4 e (dir/b)
3 b (a)
More information about the Mercurial-devel
mailing list