diff tests/test-push-checkheads-multibranches-E1.t @ 6392:faea18a26188 mercurial-5.9

test-compat: merge mercurial-6.0 into mercurial-5.9

--- a/tests/test-push-checkheads-multibranches-E1.t	Thu Dec 08 19:31:00 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E1.t	Mon Feb 06 18:56:14 2023 +0400
@@ -14,12 +14,12 @@
 .. old-state:
 ..
 .. * 1-changeset on branch default
-.. * 1-changeset on branch Z (above default)
+.. * 1-changeset on branch double//slash (above default)
 ..
 .. new-state:
 ..
 .. * 1-changeset on branch default
-.. * 1-changeset on branch Z (rebased away from A0)
+.. * 1-changeset on branch double//slash (rebased away from A0)
 ..
 .. expected-result:
 ..
@@ -46,8 +46,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg push --new-branch
@@ -59,8 +59,8 @@
   added 1 changesets with 1 changes to 1 files
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg branch --force Z
-  marked working directory as branch Z
+  $ hg branch --force double//slash
+  marked working directory as branch double//slash
   $ mkcommit B1
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
@@ -68,13 +68,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c98b855401e7 (draft): B1
+  @  7f7cd4ea4626 [double//slash] (draft): B1
   |
-  | x  93e5c1321ece (draft): B0
+  | x  1fd532b11e77 [double//slash] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing