equal
deleted
inserted
replaced
36 $ hg up ca1b80f7960a |
36 $ hg up ca1b80f7960a |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 $ echo bar > d |
38 $ echo bar > d |
39 $ hg add d |
39 $ hg add d |
40 $ hg amend |
40 $ hg amend |
41 1 new orphan changesets |
|
42 $ hg glog |
41 $ hg glog |
43 @ 5:cb6a2ab625bb added c |
42 @ 5:cb6a2ab625bb added c |
44 | () draft |
43 | () draft |
45 | * 4:c41c793e0ef1 added d |
44 | o 4:c41c793e0ef1 added d |
46 | | () draft |
45 | | () draft |
47 | x 3:ca1b80f7960a added c |
46 | x 3:ca1b80f7960a added c |
48 |/ () draft |
47 |/ () draft |
49 o 2:b1661037fa25 added b |
48 o 2:b1661037fa25 added b |
50 | () draft |
49 | () draft |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
94 [6] added d |
93 [6] added d |
95 $ echo bar > e |
94 $ echo bar > e |
96 $ hg add e |
95 $ hg add e |
97 $ hg amend |
96 $ hg amend |
98 1 new orphan changesets |
|
99 |
97 |
100 $ hg glog |
98 $ hg glog |
101 @ 8:00a5c774cc37 added d |
99 @ 8:00a5c774cc37 added d |
102 | () draft |
100 | () draft |
103 | * 7:ad0a59d83efe added e |
101 | o 7:ad0a59d83efe added e |
104 | | () draft |
102 | | () draft |
105 | x 6:2a4e03d422e2 added d |
103 | x 6:2a4e03d422e2 added d |
106 |/ () draft |
104 |/ () draft |
107 o 5:cb6a2ab625bb added c |
105 o 5:cb6a2ab625bb added c |
108 | () draft |
106 | () draft |
149 $ hg up c7586e2a9264 |
147 $ hg up c7586e2a9264 |
150 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
148 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
151 $ echo bar > b |
149 $ echo bar > b |
152 $ hg add b |
150 $ hg add b |
153 $ hg amend |
151 $ hg amend |
154 3 new orphan changesets |
|
155 |
152 |
156 $ hg evolve --all --update |
153 $ hg evolve --all --update |
157 move:[2] added b |
154 move:[2] added b |
158 atop:[9] added a |
155 atop:[9] added a |
159 merging b |
156 merging b |
212 |
209 |
213 $ echo bar > f |
210 $ echo bar > f |
214 $ echo bar > h |
211 $ echo bar > h |
215 $ hg add f h |
212 $ hg add f h |
216 $ hg amend |
213 $ hg amend |
217 4 new orphan changesets |
|
218 |
214 |
219 $ hg glog |
215 $ hg glog |
220 @ 16:645135c5caa4 added c |
216 @ 16:645135c5caa4 added c |
221 | () draft |
217 | () draft |
222 | * 15:09becba8f97d added h |
218 | o 15:09becba8f97d added h |
223 | | () draft |
219 | | () draft |
224 | * 14:5aa7b2bbd944 added g |
220 | o 14:5aa7b2bbd944 added g |
225 | | () draft |
221 | | () draft |
226 | * 13:be88f889b6dc added f |
222 | o 13:be88f889b6dc added f |
227 | | () draft |
223 | | () draft |
228 | * 12:6642d2c9176e added d |
224 | o 12:6642d2c9176e added d |
229 | | () draft |
225 | | () draft |
230 | x 11:95665a2de664 added c |
226 | x 11:95665a2de664 added c |
231 |/ () draft |
227 |/ () draft |
232 o 10:87f748868183 added b |
228 o 10:87f748868183 added b |
233 | () draft |
229 | () draft |
290 $ hg up 5794f1a3cbb2 |
286 $ hg up 5794f1a3cbb2 |
291 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
287 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
292 $ echo bar > g |
288 $ echo bar > g |
293 $ hg add g |
289 $ hg add g |
294 $ hg amend |
290 $ hg amend |
295 2 new orphan changesets |
|
296 |
291 |
297 $ hg evolve --all --update --confirm << EOF |
292 $ hg evolve --all --update --confirm << EOF |
298 > y |
293 > y |
299 > EOF |
294 > EOF |
300 move:[19] added g |
295 move:[19] added g |
341 |
336 |
342 $ hg up .^^ |
337 $ hg up .^^ |
343 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
338 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
344 $ echo foobar > g |
339 $ echo foobar > g |
345 $ hg amend |
340 $ hg amend |
346 2 new orphan changesets |
|
347 |
341 |
348 $ hg next --evolve |
342 $ hg next --evolve |
349 move:[22] added g |
343 move:[22] added g |
350 atop:[24] added f |
344 atop:[24] added f |
351 merging g |
345 merging g |
393 |/ |
387 |/ |
394 o 0 added a |
388 o 0 added a |
395 |
389 |
396 $ hg rebase -r . -d 1 |
390 $ hg rebase -r . -d 1 |
397 rebasing 2:29edef26570b "added c" |
391 rebasing 2:29edef26570b "added c" |
398 1 new orphan changesets |
|
399 $ echo conflict > c |
392 $ echo conflict > c |
400 $ hg amend |
393 $ hg amend |
401 |
394 |
402 $ hg log -G -T "{rev} {desc}\n" |
395 $ hg log -G -T "{rev} {desc}\n" |
403 @ 5 added c |
396 @ 5 added c |
404 | |
397 | |
405 | * 3 added d, modified c |
398 | o 3 added d, modified c |
406 | | |
399 | | |
407 | x 2 added c |
400 | x 2 added c |
408 | | |
401 | | |
409 o | 1 rename a to b |
402 o | 1 rename a to b |
410 |/ |
403 |/ |