[PATCH] tests: handle variation between pure and normal output in annotate --skip
Augie Fackler
raf at durin42.com
Sat Jun 10 14:49:37 UTC 2017
# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1497105966 14400
# Sat Jun 10 10:46:06 2017 -0400
# Node ID 72f2cafb81e301ec3141c37f1cb634d740ad4a89
# Parent 7e9d0d8ff938dcf8ca193c17db5321a05a48e718
tests: handle variation between pure and normal output in annotate --skip
I'm pretty sure that both results are valid, depending on how you
slice the edits.
diff --git a/tests/test-annotate.t b/tests/test-annotate.t
--- a/tests/test-annotate.t
+++ b/tests/test-annotate.t
@@ -256,11 +256,13 @@ annotate after rename merge with -l
3 b:5: b5
7 b:7: d
---skip a modified line
+--skip a modified line. Note a slight behavior difference in pure - this is
+because the pure code comes up with slightly different deltas internally.
$ hg annotate -nlf b --skip 6
0 a:1: a
- 1 a:2: z
+ 1 a:2: z (no-pure !)
+ 0 a:1: z (pure !)
1 a:3: a
3 b:4: b4
4 b:5: c
More information about the Mercurial-devel
mailing list