Mercurial > public > mercurial-scm > hg-stable
diff tests/test-mq-merge.t @ 15447:9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Globbing is usually used for filenames, so on windows it is reasonable and very
convenient that glob patterns accepts '\' or '/' when the pattern specifies
'/'.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 07 Nov 2011 03:25:10 +0100 |
| parents | 3cacc232f27f |
| children | 91eb4512edd0 |
line wrap: on
line diff
--- a/tests/test-mq-merge.t Mon Nov 07 03:24:53 2011 +0100 +++ b/tests/test-mq-merge.t Mon Nov 07 03:25:10 2011 +0100 @@ -56,7 +56,7 @@ Save the patch queue so we can merge it later: $ hg qsave -c -e - copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 + copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob) $ checkundo Update b and commit in an "update" changeset: @@ -76,7 +76,7 @@ b $ hg qpush -a -m - merging with queue at: $TESTTMP/t/.hg/patches.1 + merging with queue at: $TESTTMP/t/.hg/patches.1 (glob) applying rm_a now at: rm_a @@ -115,14 +115,14 @@ Create the reference queue: $ hg qsave -c -e -n refqueue - copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue + copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob) $ hg up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved Merge: $ HGMERGE=internal:other hg qpush -a -m -n refqueue - merging with queue at: $TESTTMP/t2/.hg/refqueue + merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) applying patcha patching file a Hunk #1 FAILED at 0