comparison 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
comparison
equal deleted inserted replaced
31055:f1b63ec4b987 31056:37ab9e20991c
476 # e, edit = use commit, but stop for amending 476 # e, edit = use commit, but stop for amending
477 # m, mess = edit commit message without changing commit content 477 # m, mess = edit commit message without changing commit content
478 # p, fold = use commit 478 # p, fold = use commit
479 # d, drop = remove commit from history 479 # d, drop = remove commit from history
480 # f, fold = use commit, but combine it with the one above 480 # f, fold = use commit, but combine it with the one above
481 # r, roll = like fold, but discard this commit's description 481 # r, roll = like fold, but discard this commit's description and date
482 # 482 #