383 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
383 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
384 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob) |
384 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob) |
385 |
385 |
386 $ hg theads |
386 $ hg theads |
387 0: 'A' |
387 0: 'A' |
|
388 |
|
389 Make sure rebase does not break for phase/filter related reason |
|
390 ---------------------------------------------------------------- |
|
391 (issue3858) |
|
392 |
|
393 $ cd .. |
|
394 |
|
395 $ cat >> $HGRCPATH << EOF |
|
396 > [ui] |
|
397 > logtemplate={rev} {desc} {phase}\n |
|
398 > EOF |
|
399 $ cat $HGRCPATH |
|
400 [ui] |
|
401 slash = True |
|
402 interactive = False |
|
403 [defaults] |
|
404 backout = -d "0 0" |
|
405 commit = -d "0 0" |
|
406 tag = -d "0 0" |
|
407 [extensions] |
|
408 graphlog= |
|
409 rebase= |
|
410 mq= |
|
411 |
|
412 [phases] |
|
413 publish=False |
|
414 |
|
415 [alias] |
|
416 tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
|
417 theads = heads --template "{rev}: '{desc}' {branches}\n" |
|
418 [ui] |
|
419 logtemplate={rev} {desc} {phase}\n |
|
420 |
|
421 |
|
422 $ hg init c4 |
|
423 $ cd c4 |
|
424 |
|
425 $ echo a > a |
|
426 $ hg ci -Am A |
|
427 adding a |
|
428 $ echo b > b |
|
429 $ hg ci -Am B |
|
430 adding b |
|
431 $ hg up 0 |
|
432 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
433 $ echo c > c |
|
434 $ hg ci -Am C |
|
435 adding c |
|
436 created new head |
|
437 $ hg up 1 |
|
438 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
439 $ hg merge |
|
440 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
441 (branch merge, don't forget to commit) |
|
442 $ hg ci -m d |
|
443 $ hg up 2 |
|
444 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
445 $ echo e > e |
|
446 $ hg ci -Am E |
|
447 adding e |
|
448 created new head |
|
449 $ hg merge 3 |
|
450 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
451 (branch merge, don't forget to commit) |
|
452 $ hg ci -m F |
|
453 $ hg up 3 |
|
454 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
455 $ echo g > g |
|
456 $ hg ci -Am G |
|
457 adding g |
|
458 created new head |
|
459 $ echo h > h |
|
460 $ hg ci -Am H |
|
461 adding h |
|
462 $ hg up 5 |
|
463 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
464 $ echo i > i |
|
465 $ hg ci -Am I |
|
466 adding i |
|
467 |
|
468 Turn most changeset public |
|
469 |
|
470 $ hg ph -p 7 |
|
471 |
|
472 $ hg heads |
|
473 8 I draft |
|
474 7 H public |
|
475 $ hg log -G |
|
476 @ 8 I draft |
|
477 | |
|
478 | o 7 H public |
|
479 | | |
|
480 | o 6 G public |
|
481 | | |
|
482 o | 5 F draft |
|
483 |\| |
|
484 o | 4 E draft |
|
485 | | |
|
486 | o 3 d public |
|
487 |/| |
|
488 o | 2 C public |
|
489 | | |
|
490 | o 1 B public |
|
491 |/ |
|
492 o 0 A public |
|
493 |
|
494 |
|
495 $ hg rebase --dest 7 --source 5 |
|
496 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob) |