##// END OF EJS Templates
histedit: improve discoverability of edit commit message
timeless@mozdev.org -
r26100:5706d130 default
parent child Browse files
Show More
@@ -38,7 +38,7 b' file open in your editor::'
38 38 # f, fold = use commit, but combine it with the one above
39 39 # r, roll = like fold, but discard this commit's description
40 40 # d, drop = remove commit from history
41 # m, mess = edit message without changing commit content
41 # m, mess = edit commit message without changing commit content
42 42 #
43 43
44 44 In this file, lines beginning with ``#`` are ignored. You must specify a rule
@@ -60,7 +60,7 b' would reorganize the file to look like t'
60 60 # f, fold = use commit, but combine it with the one above
61 61 # r, roll = like fold, but discard this commit's description
62 62 # d, drop = remove commit from history
63 # m, mess = edit message without changing commit content
63 # m, mess = edit commit message without changing commit content
64 64 #
65 65
66 66 At which point you close the editor and ``histedit`` starts working. When you
@@ -198,7 +198,7 b' editcomment = _("""# Edit history betwee'
198 198 # f, fold = use commit, but combine it with the one above
199 199 # r, roll = like fold, but discard this commit's description
200 200 # d, drop = remove commit from history
201 # m, mess = edit message without changing commit content
201 # m, mess = edit commit message without changing commit content
202 202 #
203 203 """)
204 204
@@ -69,7 +69,7 b' Run a dummy edit to make sure we get tip'
69 69 # f, fold = use commit, but combine it with the one above
70 70 # r, roll = like fold, but discard this commit's description
71 71 # d, drop = remove commit from history
72 # m, mess = edit message without changing commit content
72 # m, mess = edit commit message without changing commit content
73 73 #
74 74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 75
@@ -292,7 +292,7 b' Test that trimming description using mul'
292 292 # f, fold = use commit, but combine it with the one above
293 293 # r, roll = like fold, but discard this commit's description
294 294 # d, drop = remove commit from history
295 # m, mess = edit message without changing commit content
295 # m, mess = edit commit message without changing commit content
296 296 #
297 297 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
298 298
@@ -75,7 +75,7 b''
75 75 # f, fold = use commit, but combine it with the one above
76 76 # r, roll = like fold, but discard this commit's description
77 77 # d, drop = remove commit from history
78 # m, mess = edit message without changing commit content
78 # m, mess = edit commit message without changing commit content
79 79 #
80 80 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
81 81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
@@ -136,7 +136,7 b''
136 136 # f, fold = use commit, but combine it with the one above
137 137 # r, roll = like fold, but discard this commit's description
138 138 # d, drop = remove commit from history
139 # m, mess = edit message without changing commit content
139 # m, mess = edit commit message without changing commit content
140 140 #
141 141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
142 142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
@@ -69,7 +69,7 b' show the edit commands offered'
69 69 # f, fold = use commit, but combine it with the one above
70 70 # r, roll = like fold, but discard this commit's description
71 71 # d, drop = remove commit from history
72 # m, mess = edit message without changing commit content
72 # m, mess = edit commit message without changing commit content
73 73 #
74 74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 75
@@ -347,7 +347,7 b' Verify that revsetalias entries work wit'
347 347 # f, fold = use commit, but combine it with the one above
348 348 # r, roll = like fold, but discard this commit's description
349 349 # d, drop = remove commit from history
350 # m, mess = edit message without changing commit content
350 # m, mess = edit commit message without changing commit content
351 351 #
352 352 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
353 353
@@ -54,7 +54,7 b' Enable obsolete'
54 54 # f, fold = use commit, but combine it with the one above
55 55 # r, roll = like fold, but discard this commit's description
56 56 # d, drop = remove commit from history
57 # m, mess = edit message without changing commit content
57 # m, mess = edit commit message without changing commit content
58 58 #
59 59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 60 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
@@ -51,7 +51,7 b' show the edit commands offered by outgoi'
51 51 # f, fold = use commit, but combine it with the one above
52 52 # r, roll = like fold, but discard this commit's description
53 53 # d, drop = remove commit from history
54 # m, mess = edit message without changing commit content
54 # m, mess = edit commit message without changing commit content
55 55 #
56 56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 57 $ cd ..
@@ -83,7 +83,7 b' show the error from unrelated repos'
83 83 # f, fold = use commit, but combine it with the one above
84 84 # r, roll = like fold, but discard this commit's description
85 85 # d, drop = remove commit from history
86 # m, mess = edit message without changing commit content
86 # m, mess = edit commit message without changing commit content
87 87 #
88 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 89 $ cd ..
@@ -107,7 +107,7 b' test sensitivity to branch in URL:'
107 107 # f, fold = use commit, but combine it with the one above
108 108 # r, roll = like fold, but discard this commit's description
109 109 # d, drop = remove commit from history
110 # m, mess = edit message without changing commit content
110 # m, mess = edit commit message without changing commit content
111 111 #
112 112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 113
General Comments 0
You need to be logged in to leave comments. Login now