histedit: allow fold+edit action

Thomas De Schampheleire patrickdepinguin+mercurial at gmail.com
Fri Dec 12 13:38:12 UTC 2014


Hi,

When using histedit, it regularly happens that I want to fold one
changeset with another one, then edit the result.

For example, with following three revisions, I want to fold revision 3
into revision 1:

1  some change
2  some unrelated change
3  fix for first change

Currently, as far as I can see, this is not possible in one step.
The workaround is to use two histedit sessions, the first one:

pick 1  some change
fold 3  fix for first change
pick 2  some unrelated change

The second one edits the combined revision:

edit 1  some change + fix
pick 2  some unrelated change


I would like to be able to say 'fold+edit' in one step, something like:

pick 1  some change
fold,edit 3  fix for first change
pick 2  some unrelated change

In case there are multiple folds, one should be able to add edit on
any one of them, for example

pick 1
fold 3
fold 4
fold,edit 5
pick 2

or

pick 1
fold 3
fold,edit 4
fold 5
pick 2

or even

pick 1
fold 3
fold,edit 4
fold,edit 5
pick 2


What do you think of such a feature?
Should I create a bug report for the request?

Thanks,
Thomas


More information about the Mercurial mailing list