[PATCH] tests: avoid git diffstat singular/plural output difference
Matt Harbison
mharbison72 at gmail.com
Sun Dec 14 11:31:12 CST 2014
On Sun, 14 Dec 2014 08:17:24 -0500, Mathias De Maré
<mathias.demare at gmail.com> wrote:
> # HG changeset patch
> # User Mathias De Maré <mathias.demare at gmail.com>
> # Date 1418561696 -3600
> # Son Dez 14 13:54:56 2014 +0100
> # Node ID 4ab53fa684e3891a5228cc1e0ed7c187547d9d65
> # Parent ec09f3c6c9a94b92e58adaf0f26f7009cc75cb94
> tests: avoid git diffstat singular/plural output difference
>
> 'git diff --stat' output changed with regard to the amount
> of changes/insertions/deletions shown.
> In older git versions (1.7.7.6), output was shown as:
> 2 files changed, 2 insertions(+), 1 deletions(-)
> In newer versions, output is shown as:
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> The test was changed to execute 2 deletions, which avoids
> the difference in behaviour in older and newer git versions.
That fixes the singular/plural issue, but creates this one:
--- /home/matt/hg/tests/test-subrepo-git.t
+++ /home/matt/hg/tests/test-subrepo-git.t.err
@@ -764,7 +764,7 @@
--- a/s/foobar
+++ b/s/foobar
@@ -1,4 +1,3 @@
- woop woop
+ woopwoop
foo
-bar (no-eol)
I'm not sure how worthwhile it is to keep chasing this, so if you get sick
of trying, let me know :-). I've got a new appreciation for our trying to
keep output consistent between versions.
--Matt
More information about the Mercurial-devel
mailing list