[PATCH 1 of 4] test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b

Adrian Buehlmann adrian at cadifra.com
Fri Oct 12 04:02:02 CDT 2012


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1350029546 -7200
# Node ID 6e401b8fd940d2bfd5fea829248b92ddf101ff07
# Parent  4871c1f343fae9f38b9dc9600ab96f2017d116ce
test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b

test-log.t fails on Windows with

  --- c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t
  +++ c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t.err
  @@ -1225,12 +1225,12 @@
     $ echo 1 > d5.d/f1
     $ echo 1 > .d6/f1
     $ hg add .
  -  adding .d6/f1
  -  adding D2/f1
  -  adding D3.i/f1
  -  adding d1/f1
  -  adding d4.hg/f1
  -  adding d5.d/f1
  +  adding .d6\f1
  +  adding D2\f1
  +  adding D3.i\f1
  +  adding d1\f1
  +  adding d4.hg\f1
  +  adding d5.d\f1
     $ hg commit -m "a bunch of weird directories"
     $ hg log -l1 d1/f1 | grep changeset
     changeset:   0:65624cd9070a

diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -1224,13 +1224,7 @@
   $ echo 1 > d4.hg/f1
   $ echo 1 > d5.d/f1
   $ echo 1 > .d6/f1
-  $ hg add .
-  adding .d6/f1
-  adding D2/f1
-  adding D3.i/f1
-  adding d1/f1
-  adding d4.hg/f1
-  adding d5.d/f1
+  $ hg -q add .
   $ hg commit -m "a bunch of weird directories"
   $ hg log -l1 d1/f1 | grep changeset
   changeset:   0:65624cd9070a


More information about the Mercurial-devel mailing list