Mercurial > hg
diff tests/test-histedit-commute.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
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 10 Dec 2020 11:42:49 -0500 |
parents | 62983988bbf5 |
children | 6f8a94bbfba1 |
line wrap: on
line diff
--- a/tests/test-histedit-commute.t Thu Dec 10 14:03:46 2020 +0530 +++ b/tests/test-histedit-commute.t Thu Dec 10 11:42:49 2020 -0500 @@ -142,8 +142,8 @@ > EOF $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 4 files removed, 0 files unresolved - Editing (177f92b77385), you may commit or record as needed now. - (hg histedit --continue to resume) + Editing (177f92b77385), commit as needed now to split the change + (to edit 177f92b77385, `hg histedit --continue` after making changes) rules should end up in .hg/histedit-last-edit.txt: $ cat .hg/histedit-last-edit.txt