diff tests/test-evolve-order.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-order.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-order.t	Fri Oct 07 20:32:14 2022 -0400
@@ -95,13 +95,13 @@
   atop:[11] asecond
   move:[6] add _c
   move:[7] add _d
-  working directory is now at 739f18ac1d03
+  working directory is now at 225d2cc5d3fc
   $ hg log -G
-  @  14:739f18ac1d03@default(draft) add _d
+  @  14:225d2cc5d3fc@default(draft) add _d
   |
-  o  13:e5960578d158@default(draft) add _c
+  o  13:0fc229278e4d@default(draft) add _c
   |
-  o  12:4ad33fa88946@default(draft) bprime
+  o  12:c3741b9eafae@default(draft) bprime
   |
   o  11:9a584314f3f3@default(draft) asecond
   |
@@ -124,21 +124,21 @@
   1 changesets pruned
   1 new orphan changesets
   $ hg log -G -r "desc(_d)::"
-  @  21:dcf786e878fd@default(draft) add c1second
+  @  21:a329855d0bc1@default(draft) add c1second
   |
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | *  20:072276ece1bf@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  19:f137acd06692@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | *  18:0a1d9b2ce733@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:e2874f41c56c@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  16:3247c33339fa@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  15:df322257c182@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -154,33 +154,33 @@
   1 changesets pruned
 
   $ hg log -G -r "desc(_d)::"
-  @  27:b253ff5b65d1@default(draft) add b3prime
+  @  27:ba4c348b6d5e@default(draft) add b3prime
   |
-  o  26:4acf61f11dfb@default(draft) add b1prime
+  o  26:8fe985f5d0aa@default(draft) add b1prime
   |
-  | *  25:594e1fbbd61f@default(draft) add b4_
+  | *  25:1d9ba2e75c93@default(draft) add b4_
   | |
-  | x  24:be27500cfc76@default(draft) add b3_
+  | x  24:aec6a9657b6c@default(draft) add b3_
   | |
-  | x  23:b54f77dc5831@default(draft) add b2_
+  | x  23:a69b58575918@default(draft) add b2_
   | |
-  | x  22:0e1eba27e9aa@default(draft) add b1_
+  | x  22:3564eb18e448@default(draft) add b1_
   |/
-  | o  21:dcf786e878fd@default(draft) add c1second
+  | o  21:a329855d0bc1@default(draft) add c1second
   |/
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | *  20:072276ece1bf@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  19:f137acd06692@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | *  18:0a1d9b2ce733@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:e2874f41c56c@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  16:3247c33339fa@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  15:df322257c182@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -188,7 +188,7 @@
   $ echo "(desc(_d)::) - desc(c3_)"
   (desc(_d)::) - desc(c3_)
   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
-  skipping d096a2437fd0, consider including orphan ancestors
+  skipping 0a1d9b2ce733, consider including orphan ancestors
   move:[20] add c2prime
   atop:[21] add c1second
   move:[25] add b4_
@@ -199,23 +199,23 @@
   move:[17] add c3_
   atop:[28] add c2prime
   move:[18] add c4_
-  working directory is now at 35e7b797ace5
+  working directory is now at 4ee8feb52325
   $ hg log -G -r "desc(_d)::"
-  @  31:35e7b797ace5@default(draft) add c4_
+  @  31:4ee8feb52325@default(draft) add c4_
   |
-  o  30:0b9488394e89@default(draft) add c3_
+  o  30:08a530ce67e1@default(draft) add c3_
   |
-  | o  29:ea93190a9cd1@default(draft) add b4_
+  | o  29:4897c8ed7645@default(draft) add b4_
   | |
-  o |  28:881b9c092e53@default(draft) add c2prime
+  o |  28:3abc7618dd5f@default(draft) add c2prime
   | |
-  | o  27:b253ff5b65d1@default(draft) add b3prime
+  | o  27:ba4c348b6d5e@default(draft) add b3prime
   | |
-  | o  26:4acf61f11dfb@default(draft) add b1prime
+  | o  26:8fe985f5d0aa@default(draft) add b1prime
   | |
-  o |  21:dcf786e878fd@default(draft) add c1second
+  o |  21:a329855d0bc1@default(draft) add c1second
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -244,4 +244,4 @@
   $ hg evolve --rev "orphan()"
   move:[29] add b4_
   atop:[34] b3second
-  skipping 0b9488394e89: divergent rewriting. can't choose destination
+  skipping 08a530ce67e1: divergent rewriting. can't choose destination