diff tests/test-histedit-no-change.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-no-change.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-no-change.t	Thu Dec 10 11:42:49 2020 -0500
@@ -91,8 +91,8 @@
   | edit e860deea161a 4 e
   | pick 652413bf663e 5 f
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  Editing (e860deea161a), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (e860deea161a), commit as needed now to split the change
+  (to edit e860deea161a, `hg histedit --continue` after making changes)
   $ continueediting true "(leaving commit message unaltered)"
   % finalize changeset editing (leaving commit message unaltered)
 
@@ -142,12 +142,12 @@
   | edit e860deea161a 4 e
   | pick 652413bf663e 5 f
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  Editing (055a42cdd887), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (055a42cdd887), commit as needed now to split the change
+  (to edit 055a42cdd887, `hg histedit --continue` after making changes)
   $ continueediting true "(leaving commit message unaltered)"
   % finalize changeset editing (leaving commit message unaltered)
-  Editing (e860deea161a), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (e860deea161a), commit as needed now to split the change
+  (to edit e860deea161a, `hg histedit --continue` after making changes)
   $ graphlog "log after first edit"
   % log after first edit
   @  6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d"
@@ -211,8 +211,8 @@
   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   % start editing the history (not changing anything)
   | edit 292aec348d9e 6 closebranch
-  Editing (292aec348d9e), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (292aec348d9e), commit as needed now to split the change
+  (to edit 292aec348d9e, `hg histedit --continue` after making changes)
   $ hg histedit --abort
 
   $ cd ..