diff tests/test-evolve-public-content-divergent-discard.t @ 6316:b1d1f4ade142

evolve: don't embed graft data when completing interrupted evolve operations

This data shows in TortoiseHg, and is a bit awkward since it wasn't added before
in the non interrupted case.  It originated before 823031b51d81, when the
implementation changed away from using the graft command.  According to
@marmoute, unconditionally adding `source` served as noise to create a new hash
and prevent a cycle, so use the same key (`rebase_source`) as would happen in
the uninterrupted case (as demonstrated by the first change in
test-stabilize-conflict.t).

--- a/tests/test-evolve-public-content-divergent-discard.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-public-content-divergent-discard.t	Fri Oct 07 18:14:58 2022 -0400
@@ -397,7 +397,7 @@
   $ hg evolve --continue
   evolving 4:f89a8e2f86ac "added dh"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88
+  other divergent changeset 50a1c208f59e has same content as local e800202333a4 and differs by "description" only, discarding 50a1c208f59e
 
   $ hg evolve -l
 
@@ -617,7 +617,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97
+  other divergent changeset 573a0455bb00 has same content as local e800202333a4 and differs by "description" only, discarding 573a0455bb00
 
   $ hg evolve -l