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

login
register
mail settings
Submitter Matt Harbison
Date Nov. 9, 2015, 10:30 p.m.
Message ID <69e4a304c683f2728fb8.1447108232@waste.org>
Download mbox | patch
Permalink /patch/11341/
State Accepted
Headers show

Comments

Matt Harbison - Nov. 9, 2015, 10:30 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@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.
Matt Mackall - Nov. 13, 2015, 3:26 a.m.
On Mon, 2015-11-09 at 16:30 -0600, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@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

These are all queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

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()'