Mercurial > hg
comparison tests/test-histedit-arguments.t @ 22152:d2a5986cb89d
histedit: add "roll" command to fold commit data and drop message (issue4256)
This new histedit command (short for "rollup") is a variant of "fold" akin to
"hg amend" for working copy: it accumulates changes without interrupting
the user and asking for an updated commit message.
| author | Mike Edgar <adgar@google.com> |
|---|---|
| date | Wed, 06 Aug 2014 16:51:41 -0400 |
| parents | 50fd3a36d166 |
| children | 897041f6b025 |
comparison
equal
deleted
inserted
replaced
| 22151:c0c369aec643 | 22152:d2a5986cb89d |
|---|---|
| 55 # | 55 # |
| 56 # Commands: | 56 # Commands: |
| 57 # p, pick = use commit | 57 # p, pick = use commit |
| 58 # e, edit = use commit, but stop for amending | 58 # e, edit = use commit, but stop for amending |
| 59 # f, fold = use commit, but combine it with the one above | 59 # f, fold = use commit, but combine it with the one above |
| 60 # r, roll = like fold, but discard this commit's description | |
| 60 # d, drop = remove commit from history | 61 # d, drop = remove commit from history |
| 61 # m, mess = edit message without changing commit content | 62 # m, mess = edit message without changing commit content |
| 62 # | 63 # |
| 63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 64 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 64 | 65 |
| 253 # | 254 # |
| 254 # Commands: | 255 # Commands: |
| 255 # p, pick = use commit | 256 # p, pick = use commit |
| 256 # e, edit = use commit, but stop for amending | 257 # e, edit = use commit, but stop for amending |
| 257 # f, fold = use commit, but combine it with the one above | 258 # f, fold = use commit, but combine it with the one above |
| 259 # r, roll = like fold, but discard this commit's description | |
| 258 # d, drop = remove commit from history | 260 # d, drop = remove commit from history |
| 259 # m, mess = edit message without changing commit content | 261 # m, mess = edit message without changing commit content |
| 260 # | 262 # |
| 261 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 263 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |