diff tests/test-evolve-public-content-divergent-discard.t @ 6601:7a9d3fde811f

tests: clarify what branch we're closing

Turns out, the other topological head is on double//slash branch, but the one
we're actually closing here is on default.

--- a/tests/test-evolve-public-content-divergent-discard.t	Sun Oct 29 15:56:57 2023 -0300
+++ b/tests/test-evolve-public-content-divergent-discard.t	Mon Oct 30 14:26:30 2023 -0300
@@ -681,12 +681,12 @@
   marked working directory as topic: topic-2
 
 (make other divergent a closed branch head)
-  $ hg ci --amend -m "closing branch double//slash" --close-branch
+  $ hg ci --amend -m "closing default branch" --close-branch
   active topic 'topic-2' grew its first changeset
   (see 'hg help topics' for more information)
 
   $ hg glog
-  @  6:fe5d55b4e488 closing branch double//slash
+  @  6:638eff2d31b7 closing default branch
   |   draft content-divergent
   |
   | o  5:bde8ac1c636a added d
@@ -706,11 +706,11 @@
 
   $ hg evolve --content-divergent
   merge:[5] added d
-  with: [6] closing branch double//slash
+  with: [6] closing default branch
   base: [3] added d
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  other divergent changeset fe5d55b4e488 is a closed branch head and differs from local bde8ac1c636a by "branch, description" only, discarding fe5d55b4e488
-  content divergence resolution between bde8ac1c636a (public) and fe5d55b4e488 has same content as bde8ac1c636a, discarding fe5d55b4e488
+  other divergent changeset 638eff2d31b7 is a closed branch head and differs from local bde8ac1c636a by "branch, description" only, discarding 638eff2d31b7
+  content divergence resolution between bde8ac1c636a (public) and 638eff2d31b7 has same content as bde8ac1c636a, discarding 638eff2d31b7
   active topic 'topic-2' is now empty
   working directory is now at bde8ac1c636a