# HG changeset patch # User Marcin Kasperski # Date 1474835127 -7200 # Node ID 6506ac4ef78336f7b542d322965fd5b98d8ac371 # Parent 14a3ffbba22b79117965a201a955a1826fc54ce1 Further testfixes. diff -r 14a3ffbba22b -r 6506ac4ef783 tests/facing_problems.t --- a/tests/facing_problems.t Sun Sep 25 22:12:17 2016 +0200 +++ b/tests/facing_problems.t Sun Sep 25 22:25:27 2016 +0200 @@ -85,26 +85,12 @@ > EOF $ hg --cwd $BASE commit -m 'Second' - $ hg --cwd $BASE pushall --ignore-errors - pushing to */good1 (glob) - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - - pushing to */unrelated (glob) - searching for changes +This must go in quiet mode as various mercurials differ in the way they +report problems. + + $ hg --cwd $BASE pushall --ignore-errors --quiet error handling unrel: repository is unrelated - - error handling missing: repository */missing does not exist (glob) - - pushing to */good2 (glob) - searching for changes - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files + error handling missing: repository .*/missing (does not exist|not found) (re) $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n' 1: Second @@ -203,25 +189,11 @@ 1: Second 0: First - $ hg --cwd $BASE pullall --ignore-errors - pulling from */good1 (glob) - searching for changes - no changes found - - pulling from */unrelated (glob) - searching for changes +This also goes quiet due to differences between mercurials. + + $ hg --cwd $BASE pullall --ignore-errors --quiet error handling unrel: repository is unrelated - - pulling from */missing (glob) error handling missing: repository */missing not found (glob) - - pulling from */good2 (glob) - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 0 changes to 1 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) $ hg --cwd $BASE log --template '{rev}: {desc}\n' 3: In good2