diff tests/test-topic-flow-publish-flag.t @ 6402:2cd36fe3f4e6 mercurial-4.9

test-compat: merge mercurial-5.0 into mercurial-4.9

--- a/tests/test-topic-flow-publish-flag.t	Fri Dec 09 00:50:18 2022 +0400
+++ b/tests/test-topic-flow-publish-flag.t	Tue Feb 07 11:30:34 2023 +0400
@@ -78,8 +78,8 @@
   $ mkcommit c_dE0
   $ hg update 'desc("c_dD0")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg branch other
-  marked working directory as branch other
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit c_oF0
   $ hg push -f --publish
@@ -90,7 +90,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   $ hg tgl 'all()'
-  @  6:45b23c834b6a c_oF0 public other
+  @  6:eb49b8849195 c_oF0 public double//slash
   |
   | o  5:5576ae39eaee c_dE0 public default
   |/
@@ -116,9 +116,9 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   $ hg tgl 'all()'
-  @  7:d293f74a1233 c_oG0 draft other
+  @  7:c0155e8ec55a c_oG0 draft double//slash
   |
-  o  6:45b23c834b6a c_oF0 public other
+  o  6:eb49b8849195 c_oF0 public double//slash
   |
   | o  5:5576ae39eaee c_dE0 public default
   |/
@@ -138,9 +138,9 @@
   no changes found
   [1]
   $ hg tgl 'all()'
-  @  7:d293f74a1233 c_oG0 public other
+  @  7:c0155e8ec55a c_oG0 public double//slash
   |
-  o  6:45b23c834b6a c_oF0 public other
+  o  6:eb49b8849195 c_oF0 public double//slash
   |
   | o  5:5576ae39eaee c_dE0 public default
   |/
@@ -174,11 +174,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -209,11 +209,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -237,11 +237,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -269,11 +269,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -315,11 +315,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -369,11 +369,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -417,11 +417,11 @@
   |
   o  5:5576ae39eaee c_dE0 public default
   |
-  | o  8:8e85646c135f c_oH0 draft other
+  | o  8:256a2cb64fd8 c_oH0 draft double//slash
   | |
-  | o  7:d293f74a1233 c_oG0 public other
+  | o  7:c0155e8ec55a c_oG0 public double//slash
   | |
-  | o  6:45b23c834b6a c_oF0 public other
+  | o  6:eb49b8849195 c_oF0 public double//slash
   |/
   o  4:c63e7dd93a91 c_dD0 public default
   |
@@ -433,3 +433,18 @@
   |
   o  0:ea207398892e ROOT public default
   
+
+checking branch format in branchcache on disk
+---------------------------------------------
+
+  $ cd $TESTTMP/bare-client/.hg/cache/
+  $ grep double branch2* | sort
+  branch2-base:* o double//slash (glob)
+  branch2-immutable:* o double//slash (glob)
+  branch2-served:* o double//slash (glob)
+
+  $ cd $TESTTMP/bare-branch-server/.hg/cache/
+  $ grep double branch2* | sort
+  branch2-base:* o double//slash (glob)
+  branch2-immutable:* o double//slash (glob)
+  branch2-served:* o double//slash (glob)