Mercurial > hg-stable
changeset 26953:2da6a2dbfc42
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 09 Nov 2015 17:20:50 -0500 |
| parents | 4e566f513fd8 |
| children | f804bf27439b |
| files | tests/test-fileset.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-fileset.t Mon Nov 09 13:12:35 2015 -0500 +++ b/tests/test-fileset.t Mon Nov 09 17:20:50 2015 -0500 @@ -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()'