diff tests/test-evolve-content-divergent-stack.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-content-divergent-stack.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Oct 07 18:14:58 2022 -0400
@@ -309,23 +309,23 @@
   $ hg evolve -c
   evolving 18:2ecfb60af48a "added c and newfile"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 7e8d59a0286a
+  working directory is now at e7933de77142
 
   $ hg log -p -l1
-  changeset:   21:7e8d59a0286a
+  changeset:   21:e7933de77142
   tag:         tip
   parent:      17:5907cbc074a0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added c and newfile
   
-  diff -r 5907cbc074a0 -r 7e8d59a0286a c
+  diff -r 5907cbc074a0 -r e7933de77142 c
   --- a/c	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -conflict
   +c
-  diff -r 5907cbc074a0 -r 7e8d59a0286a newfile
+  diff -r 5907cbc074a0 -r e7933de77142 newfile
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/newfile	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -567,21 +567,21 @@
   merge:[7] added c
   with: [12] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 1a79fc84e761
-  rebasing "other" content-divergent changeset 8ed612937375 on 1a79fc84e761
+  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on f3872aea30b5
+  rebasing "other" content-divergent changeset 8ed612937375 on f3872aea30b5
   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 6c228f1e5409
-  rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409
+  rebasing "divergent" content-divergent changeset c72d2885eb51 on 72d58e863d2a
+  rebasing "other" content-divergent changeset d45f050514c2 on 72d58e863d2a
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg glog
-  o  25:957008d45543 added d
+  o  25:1ec6ea2bd496 added d
   |   () [default] draft
-  o  22:6c228f1e5409 added c
+  o  22:72d58e863d2a added c
   |   () [default] draft
-  o  19:1a79fc84e761 added b
+  o  19:f3872aea30b5 added b
   |   () [default] draft
   @  16:c758af982013 watbar to a
   |   () [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-0af4fee9-backup.hg
+  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c758af982013-458a0e95-backup.hg
   8 new content-divergent changesets
 
 Insert conflicting changes in between the stack of content-div csets