Mercurial > hg
comparison tests/test-histedit-bookmark-motion.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 | 5840da876235 |
| children | aa4a1672583e |
comparison
equal
deleted
inserted
replaced
| 22151:c0c369aec643 | 22152:d2a5986cb89d |
|---|---|
| 71 # | 71 # |
| 72 # Commands: | 72 # Commands: |
| 73 # p, pick = use commit | 73 # p, pick = use commit |
| 74 # e, edit = use commit, but stop for amending | 74 # e, edit = use commit, but stop for amending |
| 75 # f, fold = use commit, but combine it with the one above | 75 # f, fold = use commit, but combine it with the one above |
| 76 # r, roll = like fold, but discard this commit's description | |
| 76 # d, drop = remove commit from history | 77 # d, drop = remove commit from history |
| 77 # m, mess = edit message without changing commit content | 78 # m, mess = edit message without changing commit content |
| 78 # | 79 # |
| 79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 80 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 80 $ hg histedit 1 --commands - --verbose << EOF | grep histedit | 81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |
| 131 # | 132 # |
| 132 # Commands: | 133 # Commands: |
| 133 # p, pick = use commit | 134 # p, pick = use commit |
| 134 # e, edit = use commit, but stop for amending | 135 # e, edit = use commit, but stop for amending |
| 135 # f, fold = use commit, but combine it with the one above | 136 # f, fold = use commit, but combine it with the one above |
| 137 # r, roll = like fold, but discard this commit's description | |
| 136 # d, drop = remove commit from history | 138 # d, drop = remove commit from history |
| 137 # m, mess = edit message without changing commit content | 139 # m, mess = edit message without changing commit content |
| 138 # | 140 # |
| 139 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 140 $ hg histedit 1 --commands - --verbose << EOF | grep histedit | 142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |