# HG changeset patch # User Matt Harbison <matt_harbison@yahoo.com> # Date 2015-11-09 22:20:50 # Node ID 2da6a2dbfc42bdec4bcaf47da947c64ff959a59c # Parent 4e566f513fd80d353430e88251e3460ce1af0fb1 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 @@ Test merge states $ 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()'