[PATCH 4 of 4] test-fileset: glob the updated file count for Windows stability

Matt Harbison matt_harbison at yahoo.com
Mon Nov 9 16:30:32 CST 2015


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1447107650 18000
#      Mon Nov 09 17:20:50 2015 -0500
# Node ID 69e4a304c683f2728fb8261e19a283acf04523c9
# Parent  6b336cba3a589e091429c89e98ee83b89b5ea842
test-fileset: glob the updated file count for Windows stability

Some of the prior changes are platform dependent, involving symlinks, exec bits
and non portable names.  An update 10 lines above also globbed this value to
avoid differences, since this line isn't of particular interest- the filesets
are.

diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -163,7 +163,7 @@
   $ hg merge
   merging b2
   warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
-  6 files updated, 0 files merged, 1 files removed, 1 files unresolved
+  * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ fileset 'resolved()'


More information about the Mercurial-devel mailing list