Patchwork [1,of,2,STABLE] test-obsmarker-template: add missing HGENCODING=latin-1

login
register
mail settings
Submitter Yuya Nishihara
Date July 28, 2018, 7:03 a.m.
Message ID <2b7ce7b55514e248a324.1532761435@mimosa>
Download mbox | patch
Permalink /patch/32958/
State Accepted
Headers show

Comments

Yuya Nishihara - July 28, 2018, 7:03 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1532760591 -32400
#      Sat Jul 28 15:49:51 2018 +0900
# Branch stable
# Node ID 2b7ce7b55514e248a3247f135f1938090ff19045
# Parent  0f948d821fe7e5ed18e6106c162375a11e8b0546
test-obsmarker-template: add missing HGENCODING=latin-1

It just worked by accident on some Linux sh.
Gregory Szorc - July 28, 2018, 7:04 p.m.
On Sat, Jul 28, 2018 at 12:03 AM, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1532760591 -32400
> #      Sat Jul 28 15:49:51 2018 +0900
> # Branch stable
> # Node ID 2b7ce7b55514e248a3247f135f1938090ff19045
> # Parent  0f948d821fe7e5ed18e6106c162375a11e8b0546
> test-obsmarker-template: add missing HGENCODING=latin-1
>

Queued for stable.


>
> It just worked by accident on some Linux sh.
>
> diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-
> template.t
> --- a/tests/test-obsmarker-template.t
> +++ b/tests/test-obsmarker-template.t
> @@ -2600,7 +2600,7 @@ Test metadata encoding (issue5754)
>    $ mkcommit ROOT
>    $ HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0
>    $ echo 42 >> A0
> -  $ hg amend -m "A1" --note "`cat test2`"
> +  $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`"
>    $ HGENCODING=latin-1 hg amend -m "A2" \
>    > --config devel.user.obsmarker="`cat test2`"
>    $ mkcommit B0
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -2600,7 +2600,7 @@  Test metadata encoding (issue5754)
   $ mkcommit ROOT
   $ HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0
   $ echo 42 >> A0
-  $ hg amend -m "A1" --note "`cat test2`"
+  $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`"
   $ HGENCODING=latin-1 hg amend -m "A2" \
   > --config devel.user.obsmarker="`cat test2`"
   $ mkcommit B0