diff tests/test-split.t @ 6402:2cd36fe3f4e6 mercurial-4.9

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

--- a/tests/test-split.t	Fri Dec 09 00:50:18 2022 +0400
+++ b/tests/test-split.t	Tue Feb 07 11:30:34 2023 +0400
@@ -337,7 +337,7 @@
   > evolutioncommands=split
   > EOF
   $ hg split -r "desc(split3)"
-  abort: split will orphan 4 descendants
+  abort: cannot split changeset, as that will orphan 4 descendants
   (see 'hg help evolution.instability')
   [255]
 
@@ -379,8 +379,8 @@
   [255]
 
 Split empty commit (issue5191)
-  $ hg branch new-branch
-  marked working directory as branch new-branch
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ hg commit -m "empty"
   $ hg split
@@ -404,8 +404,8 @@
   active topic 'mytopic' grew its first changeset
   (see 'hg help topics' for more information)
   $ hg log -r . 
-  changeset:   18:26f72cfaf036
-  branch:      new-branch
+  changeset:   18:cdda6d69812b
+  branch:      double//slash
   tag:         tip
   topic:       mytopic
   user:        victor
@@ -413,9 +413,9 @@
   summary:     Works on mytopic
   
   $ hg summary
-  parent: 18:26f72cfaf036 tip
+  parent: 18:cdda6d69812b tip
    Works on mytopic
-  branch: new-branch:mytopic
+  branch: double//slash//mytopic
   commit: (clean)
   update: (current)
   phases: 9 draft
@@ -451,16 +451,16 @@
 Check that the topic is still here
 
   $ hg log -r "tip~1::"
-  changeset:   19:addcf498f19e
-  branch:      new-branch
+  changeset:   19:a12d854b94a2
+  branch:      double//slash
   topic:       mytopic
-  parent:      17:fdb403258632
+  parent:      17:db45bd0f0e52
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     split7
   
-  changeset:   20:2532b288af61
-  branch:      new-branch
+  changeset:   20:98274aae3990
+  branch:      double//slash
   tag:         tip
   topic:       mytopic
   user:        test
@@ -470,6 +470,12 @@
   $ hg topic
    * mytopic (2 changesets)
 
+Check commit extras
+
+  $ hg log -r "tip~1::" -T '{rev}: {join(extras, " ")}\n'
+  19: branch=double//slash topic=mytopic
+  20: branch=double//slash topic=mytopic
+
 Test split the first commit on a branch
 
   $ touch SPLIT1 SPLIT2
@@ -478,7 +484,7 @@
   marked working directory as branch another-branch
   $ hg commit -m "To be split"
   $ hg log -G -l 3
-  @  changeset:   21:b6bf93dd314b
+  @  changeset:   21:1b89fbf4d770
   |  branch:      another-branch
   |  tag:         tip
   |  topic:       mytopic
@@ -486,17 +492,17 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     To be split
   |
-  o  changeset:   20:2532b288af61
-  |  branch:      new-branch
+  o  changeset:   20:98274aae3990
+  |  branch:      double//slash
   |  topic:       mytopic
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     split8
   |
-  o  changeset:   19:addcf498f19e
-  |  branch:      new-branch
+  o  changeset:   19:a12d854b94a2
+  |  branch:      double//slash
   ~  topic:       mytopic
-     parent:      17:fdb403258632
+     parent:      17:db45bd0f0e52
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     split7
@@ -507,8 +513,8 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch another-branch
-  # Node ID b6bf93dd314ba47b838befc7488b2223981684ea
-  # Parent  2532b288af61bd19239a95ae2a3ecb9b0ad4b8e1
+  # Node ID 1b89fbf4d770c8fad85b73aada92425c00ad3a58
+  # Parent  98274aae39908fc11c1cf42c381935cfbe94695e
   # EXP-Topic mytopic
   To be split
   
@@ -543,7 +549,7 @@
 
 The split changesets should be on the 'another-branch'
   $ hg log -G -l 3
-  @  changeset:   23:56a59faa8af7
+  @  changeset:   23:492ea8acc08d
   |  branch:      another-branch
   |  tag:         tip
   |  topic:       mytopic
@@ -551,16 +557,16 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     split10
   |
-  o  changeset:   22:75695e3e2300
+  o  changeset:   22:35c3b7b7f830
   |  branch:      another-branch
   |  topic:       mytopic
-  |  parent:      20:2532b288af61
+  |  parent:      20:98274aae3990
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     split9
   |
-  o  changeset:   20:2532b288af61
-  |  branch:      new-branch
+  o  changeset:   20:98274aae3990
+  |  branch:      double//slash
   ~  topic:       mytopic
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
@@ -579,7 +585,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg log -G -l 2
-  o  changeset:   24:9f56497dbac1
+  o  changeset:   24:5e7c5b766d1e
   |  branch:      yet-another-branch
   |  tag:         tip
   |  topic:       mytopic
@@ -587,7 +593,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     To be split again
   |
-  @  changeset:   23:56a59faa8af7
+  @  changeset:   23:492ea8acc08d
   |  branch:      another-branch
   ~  topic:       mytopic
      user:        test
@@ -619,7 +625,7 @@
   another-branch
 
   $ hg log -G -l 2
-  o  changeset:   24:9f56497dbac1
+  o  changeset:   24:5e7c5b766d1e
   |  branch:      yet-another-branch
   |  tag:         tip
   |  topic:       mytopic
@@ -627,7 +633,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     To be split again
   |
-  @  changeset:   23:56a59faa8af7
+  @  changeset:   23:492ea8acc08d
   |  branch:      another-branch
   ~  topic:       mytopic
      user:        test
@@ -695,8 +701,8 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch another-branch
-  # Node ID 56a59faa8af70dc104faa905231731ffece5f18a
-  # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
+  # Node ID 492ea8acc08dae0fce72cc459218dba9043e0481
+  # Parent  35c3b7b7f83057a63307bb44ec59aebbba33c0f1
   # EXP-Topic mytopic
   split10
   
@@ -711,8 +717,8 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch another-branch
-  # Node ID 3acb634dc68ddb4dea75a9cee982955bc1f3e8cd
-  # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
+  # Node ID 1110f02dec0746d3b0493e7a09051816f7bc3179
+  # Parent  35c3b7b7f83057a63307bb44ec59aebbba33c0f1
   # EXP-Topic mytopic
   split10
   
@@ -745,8 +751,8 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch another-branch
-  # Node ID db690d5566962489d65945c90b468b44e0b1507a
-  # Parent  75695e3e2300d316cc515c4c25bab8b825ef1433
+  # Node ID 5aa51c542c1b03435a7b5b602a4953bbe3321511
+  # Parent  35c3b7b7f83057a63307bb44ec59aebbba33c0f1
   # EXP-Topic mytopic
   split12