[PATCH windows] tests: add and remove some (glob) markers
Augie Fackler
raf at durin42.com
Sat Sep 16 02:08:45 UTC 2017
# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1505527705 14400
# Fri Sep 15 22:08:25 2017 -0400
# Node ID 0da0e691552a428641c75e1633e5f1d0fbf3483e
# Parent 209120041d12b524648fa856732aa404dfedd91d
tests: add and remove some (glob) markers
I have no idea if these changes are reasonable, but they look like
they'd help on the Windows buildbot.
diff --git a/tests/test-drawdag.t b/tests/test-drawdag.t
--- a/tests/test-drawdag.t
+++ b/tests/test-drawdag.t
@@ -261,12 +261,12 @@ Change file contents via comments
a
FILE B
b
- FILE dir1/a
+ FILE dir1/a (glob)
1
2
- FILE dir1/c
+ FILE dir1/c (glob)
5
- FILE dir2/b
+ FILE dir2/b (glob)
34
- FILE dir2/c
+ FILE dir2/c (glob)
6
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -128,7 +128,7 @@ add some changesets to rename/remove/mer
$ hg merge
merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
merging sub/normal2 and stuff/normal2 to stuff/normal2
- warning: stuff/maybelarge.dat looks like a binary file. (glob)
+ warning: stuff/maybelarge.dat looks like a binary file.
warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -352,7 +352,7 @@ force a conflicted merge to occur
# Unresolved merge conflicts:
#
- # a/a
+ # a/a (glob)
#
# To mark files as resolved: hg resolve --mark FILE
More information about the Mercurial-devel
mailing list