Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-edit.t @ 31056:37ab9e20991c
histedit: modify rollup to discard date from the rollup commit (issue4820)
This change adjusts and documents the new behaviour of 'roll'. It now fits nicely
with the behaviour of 'commit --amend' and the 'edit' action, by discarding the
date as well as the commit message of the second commit. Previously it used the
later date, like 'fold', but this often wasn't desirable, for example, in the
common use case of using 'roll' to add forgotten changes to a changeset
(because 'hg add' was previously forgotten or not all changes were identified
while using 'hg record').
| author | Ben Schmidt <insightfuls@users.noreply.github.com> |
|---|---|
| date | Sat, 18 Feb 2017 21:30:28 +1100 |
| parents | 468339891670 |
| children | 154298576d44 |
line wrap: on
line diff
--- a/tests/test-histedit-edit.t Sat Feb 18 21:30:28 2017 +1100 +++ b/tests/test-histedit-edit.t Sat Feb 18 21:30:28 2017 +1100 @@ -478,5 +478,5 @@ # p, fold = use commit # d, drop = remove commit from history # f, fold = use commit, but combine it with the one above - # r, roll = like fold, but discard this commit's description + # r, roll = like fold, but discard this commit's description and date #