--- a/tests/facing_problems.t	Sat Sep 24 23:31:49 2016 +0200
+++ b/tests/facing_problems.t	Sun Sep 25 08:38:27 2016 +0200
@@ -64,6 +64,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  
   pushing to */unrelated (glob)
   searching for changes
   abort: repository is unrelated
@@ -73,6 +74,44 @@
   0: First
 
   $ hg --cwd $GOOD2 log  -T '{rev}: {desc}\n'
+
+  $ hg --cwd $UNREL log  -T '{rev}: {desc}\n'
+  0: Unrelated
+
+and again, but in non-breaking mode
+
+  $ cat >> $BASE/file.txt << EOF
+  > More text
+  > 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
+  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
+
+  $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n'
+  1: Second
+  0: First
+
+  $ hg --cwd $GOOD2 log  -T '{rev}: {desc}\n'
+  1: Second
   0: First
 
   $ hg --cwd $UNREL log  -T '{rev}: {desc}\n'
@@ -90,7 +129,7 @@
   $ hg --cwd $GOOD1 commit -m "In repo1"
 
   $ hg --cwd $UNREL update
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat > $UNREL/unr.txt << EOF
   > Another text
   > EOF
@@ -108,22 +147,85 @@
   $ hg --cwd $GOOD2 commit -m "In good2"
 
   $ hg --cwd $BASE incomingall
-  comparing with */rep1 (glob)
+  comparing with */good1 (glob)
   searching for changes
-  changeset:   1:* (glob)
+  changeset:   2:* (glob)
+  tag:         tip
+  user:        Andy Default <default@nowhere.net>
+  date:        .* (re)
+  summary:     In repo1
+  
+  comparing with */unrelated (glob)
+  searching for changes
+  abort: repository is unrelated
+  [255]
+
+  $ hg --cwd $BASE incomingall --ignore-errors
+  comparing with */good1 (glob)
+  searching for changes
+  changeset:   2:* (glob)
   tag:         tip
   user:        Andy Default <default@nowhere.net>
   date:        .* (re)
   summary:     In repo1
   
-  comparing with */rep2 (glob)
+  comparing with */unrelated (glob)
   searching for changes
-  changeset:   1:* (glob)
+  error handling unrel: repository is unrelated
+  
+  error handling missing: repository */missing not found (glob)
+  
+  comparing with */good2 (glob)
+  searching for changes
+  changeset:   2:* (glob)
   tag:         tip
   user:        Andy Default <default@nowhere.net>
   date:        .* (re)
-  summary:     In repo2
+  summary:     In good2
+  
 
   $ hg --cwd $BASE pullall
+  pulling from */good1 (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  (run 'hg update' to get a working copy)
+  
+  pulling from */unrelated (glob)
+  searching for changes
+  abort: repository is unrelated
+  [255]
  
   $ hg --cwd $BASE log -T '{rev}: {desc}\n'
+  2: In repo1
+  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
+  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 -T '{rev}: {desc}\n'
+  3: In good2
+  2: In repo1
+  1: Second
+  0: First
+