diff tests/test-histedit-arguments.t @ 46103:3f82a915ab2a

histedit: tweak `edit` message to try and guide users to our workflow

histedit predates evolve, so it drops you on an _uncommitted_ version
of the commit you're amending/splitting, which is in contrast to git
which expects you to use `git commit --amend` (I think - I'm basing
this on internal bug reports). My hope is that this output will guide
users a little more towards the expected workflow.

Differential Revision: https://phab.mercurial-scm.org/D9560

--- a/tests/test-histedit-arguments.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-arguments.t	Thu Dec 10 11:42:49 2020 -0500
@@ -149,8 +149,8 @@
   > edit 08d98a8350f3 4 five
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Editing (08d98a8350f3), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (08d98a8350f3), commit as needed now to split the change
+  (to edit 08d98a8350f3, `hg histedit --continue` after making changes)
   [240]
 
   $ hg graft --continue
@@ -335,8 +335,8 @@
   > edit eb57da33312f 2 three
   > pick f3cfcca30c44 4 x
   > EOF
-  Editing (eb57da33312f), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (eb57da33312f), commit as needed now to split the change
+  (to edit eb57da33312f, `hg histedit --continue` after making changes)
   [240]
   $ echo edit >> alpha
   $ hg histedit -q --continue
@@ -362,8 +362,8 @@
   $ hg histedit . -q --commands - << EOF
   > edit 8fda0c726bf2 6 x
   > EOF
-  Editing (8fda0c726bf2), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (8fda0c726bf2), commit as needed now to split the change
+  (to edit 8fda0c726bf2, `hg histedit --continue` after making changes)
   [240]
 Corrupt histedit state file
   $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
@@ -496,8 +496,8 @@
   $ hg histedit --cont
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
-  Editing (6f2f0241f119), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (6f2f0241f119), commit as needed now to split the change
+  (to edit 6f2f0241f119, `hg histedit --continue` after making changes)
   [240]
   $ hg resolve -m --all
   (no more unresolved files)