equal
deleted
inserted
replaced
52 > pick e860deea161a e |
52 > pick e860deea161a e |
53 > pick 652413bf663e f |
53 > pick 652413bf663e f |
54 > fold 177f92b77385 c |
54 > fold 177f92b77385 c |
55 > pick 055a42cdd887 d |
55 > pick 055a42cdd887 d |
56 > EOF |
56 > EOF |
57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
58 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 |
57 |
61 log after edit |
58 log after edit |
62 $ hg logt --graph |
59 $ hg logt --graph |
63 @ 4:9c277da72c9b d |
60 @ 4:9c277da72c9b d |
64 | |
61 | |
109 > pick d2ae7f538514 b |
106 > pick d2ae7f538514 b |
110 > roll ee283cb5f2d5 e |
107 > roll ee283cb5f2d5 e |
111 > pick 6de59d13424a f |
108 > pick 6de59d13424a f |
112 > pick 9c277da72c9b d |
109 > pick 9c277da72c9b d |
113 > EOF |
110 > EOF |
114 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
115 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
116 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 |
111 |
118 $ HGEDITOR=$OLDHGEDITOR |
112 $ HGEDITOR=$OLDHGEDITOR |
119 |
113 |
120 log after edit |
114 log after edit |
121 $ hg logt --graph |
115 $ hg logt --graph |
175 A f |
169 A f |
176 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 8e03a72b6f83 --commands - 2>&1 <<EOF |
170 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 8e03a72b6f83 --commands - 2>&1 <<EOF |
177 > pick 8e03a72b6f83 f |
171 > pick 8e03a72b6f83 f |
178 > fold c4a9eb7989fc d |
172 > fold c4a9eb7989fc d |
179 > EOF |
173 > EOF |
180 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
181 adding d |
|
182 allow non-folding commit |
174 allow non-folding commit |
183 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
184 ==== before editing |
175 ==== before editing |
185 f |
176 f |
186 *** |
177 *** |
187 c |
178 c |
188 *** |
179 *** |
240 > pick e860deea161a e |
231 > pick e860deea161a e |
241 > fold a00ad806cb55 f |
232 > fold a00ad806cb55 f |
242 > EOF |
233 > EOF |
243 editing: pick e860deea161a 4 e 1/2 changes (50.00%) |
234 editing: pick e860deea161a 4 e 1/2 changes (50.00%) |
244 editing: fold a00ad806cb55 5 f 2/2 changes (100.00%) |
235 editing: fold a00ad806cb55 5 f 2/2 changes (100.00%) |
245 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
246 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
248 |
236 |
249 tip after edit |
237 tip after edit |
250 $ hg log --rev . |
238 $ hg log --rev . |
251 changeset: 4:698d4e8040a1 |
239 changeset: 4:698d4e8040a1 |
252 tag: tip |
240 tag: tip |
370 continue: hg histedit --continue |
358 continue: hg histedit --continue |
371 $ hg commit -m '+5.2' |
359 $ hg commit -m '+5.2' |
372 created new head |
360 created new head |
373 $ echo 6 >> file |
361 $ echo 6 >> file |
374 $ HGEDITOR=cat hg histedit --continue |
362 $ HGEDITOR=cat hg histedit --continue |
375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
376 +4 |
363 +4 |
377 *** |
364 *** |
378 +5.2 |
365 +5.2 |
379 *** |
366 *** |
380 +6 |
367 +6 |
385 HG: Leave message empty to abort commit. |
372 HG: Leave message empty to abort commit. |
386 HG: -- |
373 HG: -- |
387 HG: user: test |
374 HG: user: test |
388 HG: branch 'default' |
375 HG: branch 'default' |
389 HG: changed file |
376 HG: changed file |
390 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
391 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob) |
377 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob) |
392 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) |
378 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) |
393 $ hg logt -G |
379 $ hg logt -G |
394 @ 1:10c647b2cdd5 +4 |
380 @ 1:10c647b2cdd5 +4 |
395 | |
381 | |
441 |
427 |
442 $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle |
428 $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle |
443 > pick 1c4f440a8085 rename |
429 > pick 1c4f440a8085 rename |
444 > fold e0371e0426bc b |
430 > fold e0371e0426bc b |
445 > EOF |
431 > EOF |
446 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
447 reverting b.txt |
|
448 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
449 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
450 |
432 |
451 $ hg logt --follow b.txt |
433 $ hg logt --follow b.txt |
452 1:cf858d235c76 rename |
434 1:cf858d235c76 rename |
453 0:6c795aa153cb a |
435 0:6c795aa153cb a |
454 |
436 |
487 $ hg histedit 6c795aa153cb --config hooks.commit="echo commit $NODE" --commands - 2>&1 << EOF | fixbundle |
469 $ hg histedit 6c795aa153cb --config hooks.commit="echo commit $NODE" --commands - 2>&1 << EOF | fixbundle |
488 > pick 199b6bb90248 b |
470 > pick 199b6bb90248 b |
489 > fold a1a953ffb4b0 c |
471 > fold a1a953ffb4b0 c |
490 > pick 6c795aa153cb a |
472 > pick 6c795aa153cb a |
491 > EOF |
473 > EOF |
492 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
493 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
494 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
495 commit 9599899f62c05f4377548c32bf1c9f1a39634b0c |
474 commit 9599899f62c05f4377548c32bf1c9f1a39634b0c |
496 |
475 |
497 $ hg logt |
476 $ hg logt |
498 1:9599899f62c0 a |
477 1:9599899f62c0 a |
499 0:79b99e9c8e49 b |
478 0:79b99e9c8e49 b |
528 > pick 578c7455730c 1 a |
507 > pick 578c7455730c 1 a |
529 > pick 0e01aeef5fa8 2 foo1 |
508 > pick 0e01aeef5fa8 2 foo1 |
530 > fold b7389cc4d66e 3 foo2 |
509 > fold b7389cc4d66e 3 foo2 |
531 > fold 21679ff7675c 4 foo3 |
510 > fold 21679ff7675c 4 foo3 |
532 > EOF |
511 > EOF |
533 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
534 reverting foo |
|
535 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
536 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
537 merging foo |
|
538 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
539 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
540 $ hg logt |
512 $ hg logt |
541 2:e8bedbda72c1 merged foos |
513 2:e8bedbda72c1 merged foos |
542 1:578c7455730c a |
514 1:578c7455730c a |
543 0:79b99e9c8e49 b |
515 0:79b99e9c8e49 b |
544 Editor should have run only once |
516 Editor should have run only once |