diff tests/test-evolve-abort-orphan.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 917cd662ef6c
children 1328195f76a9 aad3e0c82031
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-abort-orphan.t	Fri Oct 07 18:14:58 2022 -0400
@@ -167,7 +167,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:c41c793e0ef1 "added d"
-  working directory is now at e83de241f751
+  working directory is now at 69c43da639bb
 
   $ hg up .^^^
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -215,7 +215,7 @@
   |   () draft
   o  7:125af0ed8cae added a
   |   () draft
-  | *  6:e83de241f751 added d
+  | *  6:69c43da639bb added d
   | |   () draft orphan
   | %  5:e93a9161a274 added c
   | |   () draft orphan
@@ -234,7 +234,7 @@
   $ hg glog
   @  7:125af0ed8cae added a
   |   () draft
-  | *  6:e83de241f751 added d
+  | *  6:69c43da639bb added d
   | |   () draft orphan
   | *  5:e93a9161a274 added c
   | |   () draft orphan