##// END OF EJS Templates
tests: make unshelve tests more tricky - don't depend on size change...
Mads Kiilerich -
r20961:6c40ea34 default
parent child Browse files
Show More
@@ -531,7 +531,7 b' unshelve should keep a copy of unknown f'
531 531 z
532 532
533 533
534 unshelve and conflicts with untracked files
534 unshelve and conflicts with tracked and untracked files
535 535
536 536 preparing:
537 537
@@ -546,7 +546,7 b' unshelve and conflicts with untracked fi'
546 546 $ hg shelve
547 547 shelved as default
548 548 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
549 $ echo gold > f
549 $ echo g > f
550 550 $ hg unshelve
551 551 unshelving change 'default'
552 552 $ hg st
@@ -555,7 +555,7 b' unshelve and conflicts with untracked fi'
555 555 $ cat f
556 556 f
557 557 $ cat f.orig
558 gold
558 g
559 559
560 560 other uncommitted changes - merge:
561 561
@@ -576,7 +576,7 b' unshelve and conflicts with untracked fi'
576 576 o 0 a test
577 577
578 578 $ mv f.orig f
579 $ echo other change >> a
579 $ echo 1 > a
580 580 $ hg unshelve --date '1073741824 0'
581 581 unshelving change 'default'
582 582 temporarily committing pending changes (restore with 'hg unshelve --abort')
@@ -602,12 +602,12 b' unshelve and conflicts with untracked fi'
602 602 ? f.orig
603 603 $ cat f
604 604 <<<<<<< local
605 gold
605 g
606 606 =======
607 607 f
608 608 >>>>>>> other
609 609 $ cat f.orig
610 gold
610 g
611 611 $ hg unshelve --abort
612 612 rebase aborted
613 613 unshelve of 'default' aborted
@@ -615,7 +615,7 b' unshelve and conflicts with untracked fi'
615 615 M a
616 616 ? f.orig
617 617 $ cat f.orig
618 gold
618 g
619 619 $ hg unshelve
620 620 unshelving change 'default'
621 621 temporarily committing pending changes (restore with 'hg unshelve --abort')
@@ -645,18 +645,22 b' unshelve and conflicts with untracked fi'
645 645 ? f.orig
646 646 $ cat f
647 647 <<<<<<< local
648 gold
648 g
649 649 =======
650 650 f
651 651 >>>>>>> other
652 652 $ cat f.orig
653 gold
653 g
654 654 $ hg unshelve --abort
655 655 rebase aborted
656 656 no changes needed to a
657 657 no changes needed to d
658 658 no changes needed to e
659 659 unshelve of 'default' aborted
660 $ hg st
661 ? f.orig
662 $ cat f.orig
663 g
660 664 $ hg shelve --delete default
661 665
662 666 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now