diff tests/test-evolve-content-divergent-stack.t @ 6317:53d63b608230

evolve: stop preserving all of {extras} for uninterrupted evolve operations

I doubt the wisdom of doing this, but the case of completing interrupted evolves
does this, as do core commands for amend, graft, and rebase in hg ce9696193175,
bb14a81ce647, and b698abf971e7.

Note the obslog order (and DAG display) change in test-evolve-content-divergent-relocation.t
around line 131.  I have no idea why that would happen, or if it's an indicator
of something subtle going on.

--- a/tests/test-evolve-content-divergent-stack.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Oct 07 20:32:14 2022 -0400
@@ -478,31 +478,31 @@
   merge:[6] added b
   with: [11] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset d5f148423c16 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 6eb54b5af3fb on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset d5f148423c16 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 6eb54b5af3fb on 4c0b67f978c2
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[7] added c
   with: [12] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 80cec1b1c90f
-  rebasing "other" content-divergent changeset 8ed612937375 on 80cec1b1c90f
+  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on c2c8d7bb6505
+  rebasing "other" content-divergent changeset 8ed612937375 on c2c8d7bb6505
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [13] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset c72d2885eb51 on 7e370616fb2b
-  rebasing "other" content-divergent changeset d45f050514c2 on 7e370616fb2b
+  rebasing "divergent" content-divergent changeset c72d2885eb51 on 2d29aa40ef18
+  rebasing "other" content-divergent changeset d45f050514c2 on 2d29aa40ef18
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 7e67dfb7ee31
+  working directory is now at 4c0b67f978c2
 
   $ hg glog
-  o  24:469255caf534 added d
+  o  24:4a605b2a329e added d
   |   () [default] draft
-  o  21:7e370616fb2b added c
+  o  21:2d29aa40ef18 added c
   |   () [default] draft
-  o  18:80cec1b1c90f added b
+  o  18:c2c8d7bb6505 added b
   |   () [default] draft
-  @  15:7e67dfb7ee31 watbar to a
+  @  15:4c0b67f978c2 watbar to a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
@@ -514,7 +514,7 @@
 
   $ hg strip 14: --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/7e67dfb7ee31-ff5c6a6d-backup.hg
+  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-9e140417-backup.hg
   8 new content-divergent changesets
 
 Prepare repo to have merge conflicts
@@ -527,7 +527,7 @@
   rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   6 new orphan changesets
-  working directory is now at 7e67dfb7ee31
+  working directory is now at 4c0b67f978c2
   $ echo b_conflict > b
   $ hg amend -A
   adding b
@@ -537,7 +537,7 @@
   merge:[6] added b
   with: [11] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset d5f148423c16 on c758af982013
+  rebasing "divergent" content-divergent changeset d5f148423c16 on 6b129ddb2c87
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -550,7 +550,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 6:d5f148423c16 "added b"
-  rebasing "other" content-divergent changeset 6eb54b5af3fb on c758af982013
+  rebasing "other" content-divergent changeset 6eb54b5af3fb on 6b129ddb2c87
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -567,23 +567,23 @@
   merge:[7] added c
   with: [12] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on f3872aea30b5
-  rebasing "other" content-divergent changeset 8ed612937375 on f3872aea30b5
+  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on e55b9e217879
+  rebasing "other" content-divergent changeset 8ed612937375 on e55b9e217879
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [13] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset c72d2885eb51 on 72d58e863d2a
-  rebasing "other" content-divergent changeset d45f050514c2 on 72d58e863d2a
+  rebasing "divergent" content-divergent changeset c72d2885eb51 on 0e1902cb9cef
+  rebasing "other" content-divergent changeset d45f050514c2 on 0e1902cb9cef
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg glog
-  o  25:1ec6ea2bd496 added d
+  o  25:375c5a89ec21 added d
   |   () [default] draft
-  o  22:72d58e863d2a added c
+  o  22:0e1902cb9cef added c
   |   () [default] draft
-  o  19:f3872aea30b5 added b
+  o  19:e55b9e217879 added b
   |   () [default] draft
-  @  16:c758af982013 watbar to a
+  @  16:6b129ddb2c87 watbar to a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
@@ -594,7 +594,7 @@
 --------------------------------------------------------------
   $ hg strip 14: --hidden
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c758af982013-458a0e95-backup.hg
+  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-25c1f036-backup.hg
   8 new content-divergent changesets
 
 Insert conflicting changes in between the stack of content-div csets
@@ -635,8 +635,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -736,8 +736,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -751,7 +751,7 @@
   stopped the interrupted evolve
   working directory is now at 509103439e5e
   $ hg log -G
-  o  changeset:   21:7e67dfb7ee31
+  o  changeset:   21:4c0b67f978c2
   |  tag:         tip
   |  parent:      9:2228e3b74514
   |  user:        test
@@ -799,7 +799,7 @@
   +---x  changeset:   10:c04ff147ef79
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten using evolve as 21:7e67dfb7ee31
+  | |    obsolete:    rewritten using evolve as 21:4c0b67f978c2
   | |    summary:     added a
   | |
   o |  changeset:   9:2228e3b74514
@@ -812,7 +812,7 @@
   |/   parent:      0:8fa14d15e168
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rebased using evolve as 21:7e67dfb7ee31
+  |    obsolete:    rebased using evolve as 21:4c0b67f978c2
   |    summary:     watbar to a
   |
   o  changeset:   0:8fa14d15e168
@@ -821,11 +821,11 @@
      summary:     added hgignore
   
   $ hg obslog -r 'desc("watbar to a")' --all
-  o    7e67dfb7ee31 (21) watbar to a
-  |\     rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  o    4c0b67f978c2 (21) watbar to a
+  |\     rewritten from b0d57620c872 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |    rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  186bdc2cdfa2 (20) watbar to a
+  x |  b0d57620c872 (20) watbar to a
   | |    rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  c04ff147ef79 (10) added a
@@ -857,8 +857,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -874,16 +874,16 @@
   merge:[15] added c
   with: [18] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 48b0f803817a on ddfcba2aac91
-  rebasing "other" content-divergent changeset eaf34afe4df3 on ddfcba2aac91
+  rebasing "divergent" content-divergent changeset 48b0f803817a on 59338f08e6ef
+  rebasing "other" content-divergent changeset eaf34afe4df3 on 59338f08e6ef
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[16] added d
   with: [19] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset 91c8ccb9c241 on bb396302d792
-  rebasing "other" content-divergent changeset c351be27f199 on bb396302d792
+  rebasing "divergent" content-divergent changeset 91c8ccb9c241 on ef321c27d145
+  rebasing "other" content-divergent changeset c351be27f199 on ef321c27d145
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at ddfcba2aac91
+  working directory is now at 59338f08e6ef
 
   $ hg evolve -l
 
@@ -1018,8 +1018,8 @@
   merge:[4] c
   with: [7] c
   base: [2] c
-  rebasing "divergent" content-divergent changeset fef59171875e on bfba946a2829
-  rebasing "other" content-divergent changeset ef4885dea3da on bfba946a2829
+  rebasing "divergent" content-divergent changeset fef59171875e on 24bad874a3c7
+  rebasing "other" content-divergent changeset ef4885dea3da on 24bad874a3c7
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Expected result:
@@ -1027,15 +1027,15 @@
 Changeset with description "c" only adds file "c" with content "c".
 
   $ hg glog -l2 -p
-  o  12:a5abd6c7f9d8 c
-  |   () [default] draftdiff -r bfba946a2829 -r a5abd6c7f9d8 c
+  o  12:8a66432f9036 c
+  |   () [default] draftdiff -r 24bad874a3c7 -r 8a66432f9036 c
   |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   |  @@ -0,0 +1,1 @@
   |  +c
   |
-  o  9:bfba946a2829 b
-  |   () [default] draftdiff -r 980f7dc84c29 -r bfba946a2829 b
+  o  9:24bad874a3c7 b
+  |   () [default] draftdiff -r 980f7dc84c29 -r 24bad874a3c7 b
   ~  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
      +++ b/b	Thu Jan 01 00:00:00 1970 +0000
      @@ -0,0 +1,1 @@
@@ -1121,16 +1121,16 @@
   merge:[5] added bar and car
   with: [9] added bar and car
   base: [2] added bar and car
-  rebasing "divergent" content-divergent changeset f4ed107810a7 on 3e0693d8f69b
-  rebasing "other" content-divergent changeset 7dd5b9d42ef3 on 3e0693d8f69b
+  rebasing "divergent" content-divergent changeset f4ed107810a7 on eb084588f69b
+  rebasing "other" content-divergent changeset 7dd5b9d42ef3 on eb084588f69b
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 new orphan changesets
-  working directory is now at 3e0693d8f69b
+  working directory is now at eb084588f69b
 
   $ hg glog
-  o  15:5382795441b8 added bar and car
+  o  15:33947326df25 added bar and car
   |   () [default] draft
-  @  12:3e0693d8f69b added foo
+  @  12:eb084588f69b added foo
   |   () [default] draft
   | *  10:9a1f460df8b5 added dar
   | |   () [default] draft