Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 5811:4688b7eb7e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: preserve wdir when using --stop After this change using hg evolve --stop update the working copy parent back to where the working copy was before the hg evolve operation (or the successors of that)
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 26 Aug 2020 23:27:17 +0530
parents 961a940aef57
children fd039a7f0c3c 7204178ac04a
comparison
equal deleted inserted replaced
5810:0a364a0aba27 5811:4688b7eb7e40
536 (see 'hg help evolve.interrupted') 536 (see 'hg help evolve.interrupted')
537 [240] 537 [240]
538 538
539 $ hg evolve --stop 539 $ hg evolve --stop
540 stopped the interrupted evolve 540 stopped the interrupted evolve
541 working directory is now at e49523854bc8 541 working directory is now at 517d4375cb72
542 542
543 $ hg glog 543 $ hg glog
544 * 7:517d4375cb72 added d 544 @ 7:517d4375cb72 added d
545 | () draft 545 | () draft
546 | @ 5:e49523854bc8 added d 546 | * 5:e49523854bc8 added d
547 | | () draft 547 | | () draft
548 | o 3:ca1b80f7960a added c 548 | o 3:ca1b80f7960a added c
549 | | () draft 549 | | () draft
550 | o 2:b1661037fa25 added b 550 | o 2:b1661037fa25 added b
551 |/ () draft 551 |/ () draft
558 relocation 558 relocation
559 --------------------------------------------------------------------------- 559 ---------------------------------------------------------------------------
560 560
561 Making changes to make sure that it hits conflict while relocating 561 Making changes to make sure that it hits conflict while relocating
562 $ hg up -r 3 562 $ hg up -r 3
563 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 563 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
564 $ echo "some_changes" >> a 564 $ echo "some_changes" >> a
565 $ hg amend 565 $ hg amend
566 1 new orphan changesets 566 1 new orphan changesets
567 $ hg next 567 $ hg next
568 move:[5] added d 568 move:[5] added d
612 @@ -0,0 +1,1 @@ 612 @@ -0,0 +1,1 @@
613 +bar 613 +bar
614 614
615 $ hg evolve --stop 615 $ hg evolve --stop
616 stopped the interrupted evolve 616 stopped the interrupted evolve
617 working directory is now at c7586e2a9264 617 working directory is now at 0892835a581f
618 618
619 XXX: we should have preserved the wdir to be at rev 10 619 $ hg glog
620 $ hg glog 620 @ 10:0892835a581f added d
621 * 10:0892835a581f added d
622 | () draft 621 | () draft
623 o 8:33c16a2e0eb8 added c 622 o 8:33c16a2e0eb8 added c
624 | () draft 623 | () draft
625 | * 7:517d4375cb72 added d 624 | * 7:517d4375cb72 added d
626 | | () draft 625 | | () draft
627 o | 2:b1661037fa25 added b 626 o | 2:b1661037fa25 added b
628 |/ () draft 627 |/ () draft
629 @ 1:c7586e2a9264 added a 628 o 1:c7586e2a9264 added a
630 | () draft 629 | () draft
631 o 0:8fa14d15e168 added hgignore 630 o 0:8fa14d15e168 added hgignore
632 () draft 631 () draft
633 $ cd .. 632 $ cd ..