Mercurial > hg
comparison tests/test-histedit-commute.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 | 5490b04e6132 |
| children | b320ff822c7e |
comparison
equal
deleted
inserted
replaced
| 31055:f1b63ec4b987 | 31056:37ab9e20991c |
|---|---|
| 70 # e, edit = use commit, but stop for amending | 70 # e, edit = use commit, but stop for amending |
| 71 # m, mess = edit commit message without changing commit content | 71 # m, mess = edit commit message without changing commit content |
| 72 # p, pick = use commit | 72 # p, pick = use commit |
| 73 # d, drop = remove commit from history | 73 # d, drop = remove commit from history |
| 74 # f, fold = use commit, but combine it with the one above | 74 # f, fold = use commit, but combine it with the one above |
| 75 # r, roll = like fold, but discard this commit's description | 75 # r, roll = like fold, but discard this commit's description and date |
| 76 # | 76 # |
| 77 | 77 |
| 78 edit the history | 78 edit the history |
| 79 (use a hacky editor to check histedit-last-edit.txt backup) | 79 (use a hacky editor to check histedit-last-edit.txt backup) |
| 80 | 80 |
| 348 # e, edit = use commit, but stop for amending | 348 # e, edit = use commit, but stop for amending |
| 349 # m, mess = edit commit message without changing commit content | 349 # m, mess = edit commit message without changing commit content |
| 350 # p, pick = use commit | 350 # p, pick = use commit |
| 351 # d, drop = remove commit from history | 351 # d, drop = remove commit from history |
| 352 # f, fold = use commit, but combine it with the one above | 352 # f, fold = use commit, but combine it with the one above |
| 353 # r, roll = like fold, but discard this commit's description | 353 # r, roll = like fold, but discard this commit's description and date |
| 354 # | 354 # |
| 355 | 355 |
| 356 should also work if a commit message is missing | 356 should also work if a commit message is missing |
| 357 $ BUNDLE="$TESTDIR/missing-comment.hg" | 357 $ BUNDLE="$TESTDIR/missing-comment.hg" |
| 358 $ hg init missing | 358 $ hg init missing |