diff tests/test-evolve-public-content-divergent-corner-cases.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-corner-cases.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Oct 07 18:14:58 2022 -0400
@@ -432,7 +432,7 @@
   $ hg sum
   parent: 5:93cd84bbdaca 
    added d
-  parent: 6:2af3359250d3 tip (content-divergent)
+  parent: 6:cf77846279b4 tip (content-divergent)
    added c e
   branch: default
   commit: 1 modified, 1 unknown, 1 unresolved (merge)
@@ -447,27 +447,27 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  committed as bb4d94ae1a5a
-  working directory is now at bb4d94ae1a5a
+  committed as 01169b149789
+  working directory is now at 01169b149789
 
   $ hg export
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560
+  # Node ID 01169b149789f09d81f86d5273e56671ab645590
   # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
   phase-divergent update to 93cd84bbdaca:
   
   added c e
   
-  diff -r 93cd84bbdaca -r bb4d94ae1a5a d
+  diff -r 93cd84bbdaca -r 01169b149789 d
   --- a/d	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -dd
   +resolved
-  diff -r 93cd84bbdaca -r bb4d94ae1a5a e
+  diff -r 93cd84bbdaca -r 01169b149789 e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@