Patchwork tests: handle variation between pure and normal output in annotate --skip

login
register
mail settings
Submitter Augie Fackler
Date June 10, 2017, 2:49 p.m.
Message ID <72f2cafb81e301ec3141.1497106177@30.43.168.192.in-addr.arpa>
Download mbox | patch
Permalink /patch/21315/
State Accepted
Headers show

Comments

Augie Fackler - June 10, 2017, 2:49 p.m.
# HG changeset patch
# User Augie Fackler <raf@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.
Yuya Nishihara - June 11, 2017, 2:10 a.m.
On Sat, 10 Jun 2017 10:49:37 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf@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

Queued, thanks!

Patch

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