1 % log before edit |
|
2 @ changeset: 5:652413bf663e |
|
3 | tag: tip |
|
4 | user: test |
|
5 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
6 | summary: f |
|
7 | |
|
8 o changeset: 4:e860deea161a |
|
9 | user: test |
|
10 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
11 | summary: e |
|
12 | |
|
13 o changeset: 3:055a42cdd887 |
|
14 | user: test |
|
15 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
16 | summary: d |
|
17 | |
|
18 o changeset: 2:177f92b77385 |
|
19 | user: test |
|
20 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
21 | summary: c |
|
22 | |
|
23 o changeset: 1:d2ae7f538514 |
|
24 | user: test |
|
25 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
26 | summary: b |
|
27 | |
|
28 o changeset: 0:cb9a9f314b8b |
|
29 user: test |
|
30 date: Thu Jan 01 00:00:00 1970 +0000 |
|
31 summary: a |
|
32 |
|
33 % show the edit commands offered |
|
34 pick 177f92b77385 2 c |
|
35 pick 055a42cdd887 3 d |
|
36 pick e860deea161a 4 e |
|
37 pick 652413bf663e 5 f |
|
38 |
|
39 # Edit history between 177f92b77385 and 652413bf663e |
|
40 # |
|
41 # Commands: |
|
42 # p, pick = use commit |
|
43 # e, edit = use commit, but stop for amending |
|
44 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
|
45 # d, drop = remove commit from history |
|
46 # m, mess = edit message without changing commit content |
|
47 # |
|
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 % edit the history |
|
50 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
51 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
53 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
54 % rules should end up in .hg/histedit-last-edit.txt: |
|
55 pick 177f92b77385 c |
|
56 pick e860deea161a e |
|
57 pick 652413bf663e f |
|
58 pick 055a42cdd887 d |
|
59 **** end of rules file **** |
|
60 % log after edit |
|
61 @ changeset: 5:853c68da763f |
|
62 | tag: tip |
|
63 | user: test |
|
64 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 | summary: d |
|
66 | |
|
67 o changeset: 4:26f6a030ae82 |
|
68 | user: test |
|
69 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
70 | summary: f |
|
71 | |
|
72 o changeset: 3:b069cc29fb22 |
|
73 | user: test |
|
74 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
75 | summary: e |
|
76 | |
|
77 o changeset: 2:177f92b77385 |
|
78 | user: test |
|
79 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
80 | summary: c |
|
81 | |
|
82 o changeset: 1:d2ae7f538514 |
|
83 | user: test |
|
84 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 | summary: b |
|
86 | |
|
87 o changeset: 0:cb9a9f314b8b |
|
88 user: test |
|
89 date: Thu Jan 01 00:00:00 1970 +0000 |
|
90 summary: a |
|
91 |
|
92 % put things back |
|
93 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
94 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 @ changeset: 5:652413bf663e |
|
98 | tag: tip |
|
99 | user: test |
|
100 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
101 | summary: f |
|
102 | |
|
103 o changeset: 4:e860deea161a |
|
104 | user: test |
|
105 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
106 | summary: e |
|
107 | |
|
108 o changeset: 3:055a42cdd887 |
|
109 | user: test |
|
110 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
111 | summary: d |
|
112 | |
|
113 o changeset: 2:177f92b77385 |
|
114 | user: test |
|
115 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
116 | summary: c |
|
117 | |
|
118 o changeset: 1:d2ae7f538514 |
|
119 | user: test |
|
120 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
121 | summary: b |
|
122 | |
|
123 o changeset: 0:cb9a9f314b8b |
|
124 user: test |
|
125 date: Thu Jan 01 00:00:00 1970 +0000 |
|
126 summary: a |
|
127 |
|
128 % slightly different this time |
|
129 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
130 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
134 @ changeset: 5:99a62755c625 |
|
135 | tag: tip |
|
136 | user: test |
|
137 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
138 | summary: c |
|
139 | |
|
140 o changeset: 4:7c6fdd608667 |
|
141 | user: test |
|
142 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
143 | summary: e |
|
144 | |
|
145 o changeset: 3:c4f52e213402 |
|
146 | user: test |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
148 | summary: f |
|
149 | |
|
150 o changeset: 2:bfe4a5a76b37 |
|
151 | user: test |
|
152 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
153 | summary: d |
|
154 | |
|
155 o changeset: 1:d2ae7f538514 |
|
156 | user: test |
|
157 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
158 | summary: b |
|
159 | |
|
160 o changeset: 0:cb9a9f314b8b |
|
161 user: test |
|
162 date: Thu Jan 01 00:00:00 1970 +0000 |
|
163 summary: a |
|
164 |
|
165 % keep prevents stripping dead revs |
|
166 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
167 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
168 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 @ changeset: 7:99e266581538 |
|
170 | tag: tip |
|
171 | user: test |
|
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
173 | summary: e |
|
174 | |
|
175 o changeset: 6:5ad36efb0653 |
|
176 | parent: 3:c4f52e213402 |
|
177 | user: test |
|
178 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
179 | summary: c |
|
180 | |
|
181 | o changeset: 5:99a62755c625 |
|
182 | | user: test |
|
183 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
184 | | summary: c |
|
185 | | |
|
186 | o changeset: 4:7c6fdd608667 |
|
187 |/ user: test |
|
188 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
189 | summary: e |
|
190 | |
|
191 o changeset: 3:c4f52e213402 |
|
192 | user: test |
|
193 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
194 | summary: f |
|
195 | |
|
196 o changeset: 2:bfe4a5a76b37 |
|
197 | user: test |
|
198 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
199 | summary: d |
|
200 | |
|
201 o changeset: 1:d2ae7f538514 |
|
202 | user: test |
|
203 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
204 | summary: b |
|
205 | |
|
206 o changeset: 0:cb9a9f314b8b |
|
207 user: test |
|
208 date: Thu Jan 01 00:00:00 1970 +0000 |
|
209 summary: a |
|
210 |
|
211 % try with --rev |
|
212 abort: may not use changesets other than the ones listed |
|
213 @ changeset: 7:99e266581538 |
|
214 | tag: tip |
|
215 | user: test |
|
216 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
217 | summary: e |
|
218 | |
|
219 o changeset: 6:5ad36efb0653 |
|
220 | parent: 3:c4f52e213402 |
|
221 | user: test |
|
222 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
223 | summary: c |
|
224 | |
|
225 | o changeset: 5:99a62755c625 |
|
226 | | user: test |
|
227 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
228 | | summary: c |
|
229 | | |
|
230 | o changeset: 4:7c6fdd608667 |
|
231 |/ user: test |
|
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
233 | summary: e |
|
234 | |
|
235 o changeset: 3:c4f52e213402 |
|
236 | user: test |
|
237 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
238 | summary: f |
|
239 | |
|
240 o changeset: 2:bfe4a5a76b37 |
|
241 | user: test |
|
242 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
243 | summary: d |
|
244 | |
|
245 o changeset: 1:d2ae7f538514 |
|
246 | user: test |
|
247 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
248 | summary: b |
|
249 | |
|
250 o changeset: 0:cb9a9f314b8b |
|
251 user: test |
|
252 date: Thu Jan 01 00:00:00 1970 +0000 |
|
253 summary: a |
|
254 |
|
255 % should also work if a commit message is missing |
|
256 adding changesets |
|
257 adding manifests |
|
258 adding file changes |
|
259 added 3 changesets with 3 changes to 1 files |
|
260 (run 'hg update' to get a working copy) |
|
261 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 @ changeset: 2:bd22688093b3 |
|
263 | tag: tip |
|
264 | user: Robert Altman <robert.altman@telventDTN.com> |
|
265 | date: Mon Nov 28 16:40:04 2011 +0000 |
|
266 | summary: Update file. |
|
267 | |
|
268 o changeset: 1:3b3e956f9171 |
|
269 | user: Robert Altman <robert.altman@telventDTN.com> |
|
270 | date: Mon Nov 28 16:37:57 2011 +0000 |
|
271 | |
|
272 o changeset: 0:141947992243 |
|
273 user: Robert Altman <robert.altman@telventDTN.com> |
|
274 date: Mon Nov 28 16:35:28 2011 +0000 |
|
275 summary: Checked in text file |
|
276 |
|
277 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|