diff tests/test-bookmarks-corner-case.t @ 42546:904e0da2e195

merge with stable

--- a/tests/test-bookmarks-corner-case.t	Fri Jun 28 14:13:00 2019 -0700
+++ b/tests/test-bookmarks-corner-case.t	Sun Jun 30 15:10:56 2019 +0900
@@ -201,7 +201,6 @@
   $ cat push-output.txt
   pushing to ssh://user@dummy/bookrace-server
   searching for changes
-  remote has heads on branch 'default' that are not known locally: f26c3b5167d1
   remote: setting raced push up
   remote: adding changesets
   remote: adding manifests
@@ -221,7 +220,7 @@
   |  summary:     A1
   |
   | o  changeset:   3:f26c3b5167d1
-  | |  bookmark:    book-B
+  | |  bookmark:    book-B (false !)
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     B1
@@ -244,4 +243,4 @@
   
   $ hg -R bookrace-server book
      book-A                    4:9ce3b28c16de
-     book-B                    3:f26c3b5167d1
+     book-B                    3:f26c3b5167d1 (false !)