comparison tests/test-histedit-commute.t @ 27674:78d86664e3a2

histedit: prefer edit commit, edit message, use commit Selecting editing commits, rewording commit messages, and selecting commits are key actions, we will prefer them more generally in a future commit, this pulls them ahead before that to make the diffs easier to read. The remaining commands are left alphabetically sorted
author timeless <timeless@mozdev.org>
date Wed, 23 Dec 2015 21:20:08 +0000
parents e7ff83b2bcfe
children bb810c8b3eca
comparison
equal deleted inserted replaced
27673:d93d340dc6ee 27674:78d86664e3a2
62 # Edit history between 177f92b77385 and 652413bf663e 62 # Edit history between 177f92b77385 and 652413bf663e
63 # 63 #
64 # Commits are listed from least to most recent 64 # Commits are listed from least to most recent
65 # 65 #
66 # Commands: 66 # Commands:
67 #
68 # e, edit = use commit, but stop for amending
69 # m, mess = edit commit message without changing commit content
67 # p, pick = use commit 70 # p, pick = use commit
68 # e, edit = use commit, but stop for amending 71 # d, drop = remove commit from history
69 # f, fold = use commit, but combine it with the one above 72 # f, fold = use commit, but combine it with the one above
70 # r, roll = like fold, but discard this commit's description 73 # r, roll = like fold, but discard this commit's description
71 # d, drop = remove commit from history
72 # m, mess = edit commit message without changing commit content
73 # 74 #
74 75
75 edit the history 76 edit the history
76 (use a hacky editor to check histedit-last-edit.txt backup) 77 (use a hacky editor to check histedit-last-edit.txt backup)
77 78
340 # Edit history between ece0b8d93dda and 9c863c565126 341 # Edit history between ece0b8d93dda and 9c863c565126
341 # 342 #
342 # Commits are listed from least to most recent 343 # Commits are listed from least to most recent
343 # 344 #
344 # Commands: 345 # Commands:
346 #
347 # e, edit = use commit, but stop for amending
348 # m, mess = edit commit message without changing commit content
345 # p, pick = use commit 349 # p, pick = use commit
346 # e, edit = use commit, but stop for amending 350 # d, drop = remove commit from history
347 # f, fold = use commit, but combine it with the one above 351 # f, fold = use commit, but combine it with the one above
348 # r, roll = like fold, but discard this commit's description 352 # r, roll = like fold, but discard this commit's description
349 # d, drop = remove commit from history
350 # m, mess = edit commit message without changing commit content
351 # 353 #
352 354
353 should also work if a commit message is missing 355 should also work if a commit message is missing
354 $ BUNDLE="$TESTDIR/missing-comment.hg" 356 $ BUNDLE="$TESTDIR/missing-comment.hg"
355 $ hg init missing 357 $ hg init missing