Mercurial > evolve

diff tests/test-evolve-abort-phasediv.t @ 6316:b1d1f4ade142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1cbafebe874b
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-abort-phasediv.t	Fri Oct 07 18:14:58 2022 -0400
@@ -302,7 +302,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 9:28cd06b3f801 "added c"
-  committed as 95d746965290
+  committed as 92acf49069a4
   recreate:[10] added d
   atop:[4] added d
   rebasing to destination parent: ca1b80f7960a