[PATCH STABLE] test-histedit-fold: fix for Windows

Augie Fackler lists at durin42.com
Thu Jul 26 17:12:14 CDT 2012


Sigh, windows. Thanks for the fix, LGTM.

On Thu, Jul 26, 2012 at 4:15 PM, Adrian Buehlmann <adrian at cadifra.com> wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1343336914 -7200
> # Branch stable
> # Node ID 0668364e997d483907dcb03379a3dfa978b346a9
> # Parent  98166640b356b4c44bc87ce9137c7647eb728332
> test-histedit-fold: fix for Windows
>
> Fixes 336121088ef1 failing with MSYS.
>
> MSYS sh.exe mangled that path by applying its path magic, which caused the
> test to fail on Windows.
>
> diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
> --- a/tests/test-histedit-fold.t
> +++ b/tests/test-histedit-fold.t
> @@ -208,7 +208,7 @@
>    |
>    o  0:0189ba417d34 1+2+3
>
> -  $ EDITED=`pwd`/../editcommands
> +  $ EDITED="$TESTTMP/editcommands"
>    $ cat > $EDITED <<EOF
>    > pick 617f94f13c0f 1 +4
>    > drop 888f9082bf99 2 +5
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list