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

Adrian Buehlmann adrian at cadifra.com
Thu Jul 26 16:21:17 CDT 2012


On 2012-07-26 23:15, Adrian Buehlmann 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.
> 

It failed like this:

--- C:\Users\adi\hgrepos\hg-main\tests\test-histedit-fold.t
+++ C:\Users\adi\hgrepos\hg-main\tests\test-histedit-fold.t.err
@@ -215,24 +215,14 @@
   > fold 251d831eeec5 3 +6
   > EOF
   $ HGEDITOR="cat $EDITED >" hg histedit 1
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  patching file file
-  Hunk #1 FAILED at 2
-  1 out of 1 hunks FAILED -- saving rejects to file file.rej
-  abort: Fix up the change and run hg histedit --continue
+  cat: C;c:\MinGW\msys\1.0\Users\adi\AppData\Local\Temp\hgtests.glvhft\test-histedit-fold.t\fold-with-dropped\..\editcommands: No such file or directory
+  abort: edit failed: cat exited with status 1
   [255]
   $ echo 5 >> file
   $ hg commit -m '+5.2'
-  created new head
   $ echo 6 >> file
   $ HGEDITOR=cat hg histedit --continue
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  +4
-  ***
-  +5.2
-  ***
-  +6
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
+  abort: No such file or directory: $TESTTMP\fold-with-dropped\.hg\histedit-state
+  [255]
   $ cd ..


More information about the Mercurial-devel mailing list