Mercurial > hg

comparison tests/test-shelve.t @ 23517:4f18e80d9c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show more useful status information while rebasing Show status messages while rebasing, similar to what graft do: rebasing 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:45:26 +0100
parents e955549cd045
children 2fb0504b8175
comparison
equal deleted inserted replaced
23516:328afbad6e57 23517:4f18e80d9c30
108 $ printf "z\na\n" > a/a 108 $ printf "z\na\n" > a/a
109 $ hg unshelve --keep 109 $ hg unshelve --keep
110 unshelving change 'default-01' 110 unshelving change 'default-01'
111 temporarily committing pending changes (restore with 'hg unshelve --abort') 111 temporarily committing pending changes (restore with 'hg unshelve --abort')
112 rebasing shelved changes 112 rebasing shelved changes
113 rebasing 4:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
113 merging a/a 114 merging a/a
114 115
115 $ hg revert --all -q 116 $ hg revert --all -q
116 $ rm a/a.orig b.rename/b c.copy 117 $ rm a/a.orig b.rename/b c.copy
117 118
200 201
201 $ hg unshelve 202 $ hg unshelve
202 unshelving change 'default' 203 unshelving change 'default'
203 temporarily committing pending changes (restore with 'hg unshelve --abort') 204 temporarily committing pending changes (restore with 'hg unshelve --abort')
204 rebasing shelved changes 205 rebasing shelved changes
206 rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
205 merging a/a 207 merging a/a
206 warning: conflicts during merge. 208 warning: conflicts during merge.
207 merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') 209 merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
208 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') 210 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
209 [1] 211 [1]
310 abort: unshelve already in progress 312 abort: unshelve already in progress
311 (use 'hg unshelve --continue' or 'hg unshelve --abort') 313 (use 'hg unshelve --continue' or 'hg unshelve --abort')
312 [255] 314 [255]
313 315
314 $ hg unshelve -c 316 $ hg unshelve -c
317 rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
315 unshelve of 'default' complete 318 unshelve of 'default' complete
316 319
317 ensure the repo is as we hope 320 ensure the repo is as we hope
318 321
319 $ hg parents 322 $ hg parents
380 383
381 $ HGMERGE=true hg unshelve 384 $ HGMERGE=true hg unshelve
382 unshelving change 'default' 385 unshelving change 'default'
383 temporarily committing pending changes (restore with 'hg unshelve --abort') 386 temporarily committing pending changes (restore with 'hg unshelve --abort')
384 rebasing shelved changes 387 rebasing shelved changes
388 rebasing 6:c5e6910e7601 "changes to 'second'" (tip)
385 merging a/a 389 merging a/a
386 $ hg parents -q 390 $ hg parents -q
387 4:33f7f61e6c5e 391 4:33f7f61e6c5e
388 $ hg shelve -l 392 $ hg shelve -l
389 $ hg status 393 $ hg status
459 $ echo c >> z 463 $ echo c >> z
460 $ hg shelve 464 $ hg shelve
461 shelved as default 465 shelved as default
462 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 466 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
463 $ hg rebase -d 1 --config extensions.rebase= 467 $ hg rebase -d 1 --config extensions.rebase=
468 rebasing 2:323bfa07f744 "xyz" (tip)
464 merging x 469 merging x
465 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob) 470 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob)
466 $ hg unshelve 471 $ hg unshelve
467 unshelving change 'default' 472 unshelving change 'default'
468 rebasing shelved changes 473 rebasing shelved changes
474 rebasing 4:b8fefe789ed0 "changes to 'xyz'" (tip)
469 $ hg status 475 $ hg status
470 M z 476 M z
471 477
472 $ cd .. 478 $ cd ..
473 479
490 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 496 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
491 $ hg up -q 1 497 $ hg up -q 1
492 $ hg unshelve 498 $ hg unshelve
493 unshelving change 'default' 499 unshelving change 'default'
494 rebasing shelved changes 500 rebasing shelved changes
501 rebasing 3:0cae6656c016 "changes to 'c'" (tip)
495 $ hg status 502 $ hg status
496 A d 503 A d
497 504
498 unshelve should work on an ancestor of the original commit 505 unshelve should work on an ancestor of the original commit
499 506
503 $ hg up 0 510 $ hg up 0
504 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 511 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
505 $ hg unshelve 512 $ hg unshelve
506 unshelving change 'default' 513 unshelving change 'default'
507 rebasing shelved changes 514 rebasing shelved changes
515 rebasing 3:be58f65f55fb "changes to 'b'" (tip)
508 $ hg status 516 $ hg status
509 A d 517 A d
510 518
511 test bug 4073 we need to enable obsolete markers for it 519 test bug 4073 we need to enable obsolete markers for it
512 520
600 $ echo 1 > a 608 $ echo 1 > a
601 $ hg unshelve --date '1073741824 0' 609 $ hg unshelve --date '1073741824 0'
602 unshelving change 'default' 610 unshelving change 'default'
603 temporarily committing pending changes (restore with 'hg unshelve --abort') 611 temporarily committing pending changes (restore with 'hg unshelve --abort')
604 rebasing shelved changes 612 rebasing shelved changes
613 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
605 merging f 614 merging f
606 warning: conflicts during merge. 615 warning: conflicts during merge.
607 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 616 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
608 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') 617 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
609 [1] 618 [1]
639 g 648 g
640 $ hg unshelve 649 $ hg unshelve
641 unshelving change 'default' 650 unshelving change 'default'
642 temporarily committing pending changes (restore with 'hg unshelve --abort') 651 temporarily committing pending changes (restore with 'hg unshelve --abort')
643 rebasing shelved changes 652 rebasing shelved changes
653 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
644 $ hg st 654 $ hg st
645 M a 655 M a
646 A f 656 A f
647 ? f.orig 657 ? f.orig
648 658
654 $ hg ci a -m 'intermediate other change' 664 $ hg ci a -m 'intermediate other change'
655 $ mv f.orig f 665 $ mv f.orig f
656 $ hg unshelve 666 $ hg unshelve
657 unshelving change 'default' 667 unshelving change 'default'
658 rebasing shelved changes 668 rebasing shelved changes
669 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
659 merging f 670 merging f
660 warning: conflicts during merge. 671 warning: conflicts during merge.
661 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 672 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
662 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') 673 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
663 [1] 674 [1]
695 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 706 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
696 (activating bookmark test) 707 (activating bookmark test)
697 $ hg unshelve 708 $ hg unshelve
698 unshelving change 'default' 709 unshelving change 'default'
699 rebasing shelved changes 710 rebasing shelved changes
711 rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
700 merging a/a 712 merging a/a
701 warning: conflicts during merge. 713 warning: conflicts during merge.
702 merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark') 714 merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
703 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') 715 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
704 [1] 716 [1]
709 $ hg revert -a -r . 721 $ hg revert -a -r .
710 reverting a/a (glob) 722 reverting a/a (glob)
711 $ hg resolve -m a/a 723 $ hg resolve -m a/a
712 (no more unresolved files) 724 (no more unresolved files)
713 $ hg unshelve -c 725 $ hg unshelve -c
726 rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
714 unshelve of 'default' complete 727 unshelve of 'default' complete
715 $ hg diff 728 $ hg diff
716 $ hg status 729 $ hg status
717 ? a/a.orig 730 ? a/a.orig
718 ? foo/foo 731 ? foo/foo