[PATCH] test-commit-amend: adapt for Windows after fba17a64fa49

Adrian Buehlmann adrian at cadifra.com
Fri Jun 29 09:01:34 CDT 2012


On 2012-06-29 15:46, Idan Kamara wrote:
[..]
>     @@ -32,7 +34,7 @@
>       $ hg ci --amend -m 'amend base1'
>       pretxncommit 9cd25b479c51be2f4ed2c38e7abdf7ce67d8e0dc
>       9cd25b479c51 tip
>     -  saved backup bundle to
>     $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
>     +  saved backup bundle to
>     $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
> 
> 
> Doesn't look like anything is globbed here.

Yeah. This confuses myself at times too.

Windows outputs the slashes as backslashes, which are globbed away by (glob).

Without that (glob), the test fails on Windows with:

  $ PATH="/mingw/bin:/bin:/c/python:/c/python/scripts" python run-tests.py --local test-commit-amend.t

  --- C:\Users\adi\hgrepos\hg-main\tests\test-commit-amend.t
  +++ C:\Users\adi\hgrepos\hg-main\tests\test-commit-amend.t.err
  @@ -34,7 +34,7 @@
     $ hg ci --amend -m 'amend base1'
     pretxncommit 9cd25b479c51be2f4ed2c38e7abdf7ce67d8e0dc
     9cd25b479c51 tip
  -  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
  +  saved backup bundle to $TESTTMP\.hg\strip-backup\489edb5b847d-amend-backup.hg
     $ echo 'pretxncommit.foo = ' >> $HGRCPATH
     $ hg diff -c .
     diff -r ad120869acf0 -r 9cd25b479c51 a

  ERROR: C:\Users\adi\hgrepos\hg-main\tests\test-commit-amend.t output changed
  !
  Failed test-commit-amend.t: output changed
  # Ran 1 tests, 0 skipped, 1 failed.



More information about the Mercurial-devel mailing list