diff tests/test-evolve-phase.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).
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 07 Oct 2022 18:14:58 -0400
parents c5dfbbe4363d
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-phase.t	Fri Oct 07 18:14:58 2022 -0400
@@ -128,7 +128,7 @@
   evolving 2:13833940840c "c"
 
   $ hg glog
-  o  4 - 3d2080c198e5 c (secret)
+  o  4 - 82e9fa5a553a c (secret)
   |
   @  3 - 87495ea7c9ec b (draft)
   |