equal
deleted
inserted
replaced
217 temporarily committing pending changes (restore with 'hg unshelve --abort') |
217 temporarily committing pending changes (restore with 'hg unshelve --abort') |
218 rebasing shelved changes |
218 rebasing shelved changes |
219 merging f |
219 merging f |
220 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
220 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
221 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
221 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
222 [1] |
222 [240] |
223 |
223 |
224 #if phasebased |
224 #if phasebased |
225 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' |
225 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' |
226 @ 9 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 |
226 @ 9 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 |
227 | |
227 | |
288 unshelving change 'default' |
288 unshelving change 'default' |
289 rebasing shelved changes |
289 rebasing shelved changes |
290 merging f |
290 merging f |
291 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
291 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
292 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
292 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
293 [1] |
293 [240] |
294 $ hg st |
294 $ hg st |
295 M f |
295 M f |
296 ? f.orig |
296 ? f.orig |
297 $ cat f |
297 $ cat f |
298 <<<<<<< working-copy: 6b563750f973 - test: intermediate other change |
298 <<<<<<< working-copy: 6b563750f973 - test: intermediate other change |
343 $ hg shelve -q |
343 $ hg shelve -q |
344 $ echo 'contADDent' > root |
344 $ echo 'contADDent' > root |
345 $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups' |
345 $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups' |
346 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
346 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
347 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
347 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
348 [1] |
348 [240] |
349 $ ls .hg/origbackups |
349 $ ls .hg/origbackups |
350 root |
350 root |
351 $ rm -rf .hg/origbackups |
351 $ rm -rf .hg/origbackups |
352 |
352 |
353 test Abort unshelve always gets user out of the unshelved state |
353 test Abort unshelve always gets user out of the unshelved state |
561 temporarily committing pending changes (restore with 'hg unshelve --abort') |
561 temporarily committing pending changes (restore with 'hg unshelve --abort') |
562 rebasing shelved changes |
562 rebasing shelved changes |
563 merging a |
563 merging a |
564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
565 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
565 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
566 [1] |
566 [240] |
567 $ echo "aaabbbccc" > a |
567 $ echo "aaabbbccc" > a |
568 $ rm a.orig |
568 $ rm a.orig |
569 $ hg resolve --mark a |
569 $ hg resolve --mark a |
570 (no more unresolved files) |
570 (no more unresolved files) |
571 continue: hg unshelve --continue |
571 continue: hg unshelve --continue |
635 temporarily committing pending changes (restore with 'hg unshelve --abort') |
635 temporarily committing pending changes (restore with 'hg unshelve --abort') |
636 rebasing shelved changes |
636 rebasing shelved changes |
637 merging a |
637 merging a |
638 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
638 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
639 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
639 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
640 [1] |
640 [240] |
641 |
641 |
642 Removing restore branch information from shelvedstate file(making it looks like |
642 Removing restore branch information from shelvedstate file(making it looks like |
643 in previous versions) and running unshelve --continue |
643 in previous versions) and running unshelve --continue |
644 |
644 |
645 $ cp .hg/shelvedstate .hg/shelvedstate_old |
645 $ cp .hg/shelvedstate .hg/shelvedstate_old |
713 unshelving change 'default' |
713 unshelving change 'default' |
714 rebasing shelved changes |
714 rebasing shelved changes |
715 merging file |
715 merging file |
716 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
716 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
717 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
717 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
718 [1] |
718 [240] |
719 $ echo somethingsomething > .hg/shelvedstate |
719 $ echo somethingsomething > .hg/shelvedstate |
720 |
720 |
721 Unshelve --continue fails with appropriate message if shelvedstate is corrupted |
721 Unshelve --continue fails with appropriate message if shelvedstate is corrupted |
722 $ hg continue |
722 $ hg continue |
723 abort: corrupted shelved state file |
723 abort: corrupted shelved state file |
760 unshelving change 'default' |
760 unshelving change 'default' |
761 rebasing shelved changes |
761 rebasing shelved changes |
762 merging file |
762 merging file |
763 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
763 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
764 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
764 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
765 [1] |
765 [240] |
766 $ hg resolve --mark file |
766 $ hg resolve --mark file |
767 (no more unresolved files) |
767 (no more unresolved files) |
768 continue: hg unshelve --continue |
768 continue: hg unshelve --continue |
769 $ hg continue |
769 $ hg continue |
770 unshelve of 'default' complete |
770 unshelve of 'default' complete |
817 unshelving change 'ashelve' |
817 unshelving change 'ashelve' |
818 rebasing shelved changes |
818 rebasing shelved changes |
819 merging a |
819 merging a |
820 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
820 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
821 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
821 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
822 [1] |
822 [240] |
823 putting v1 shelvedstate file in place of a created v2 |
823 putting v1 shelvedstate file in place of a created v2 |
824 $ cat << EOF > .hg/shelvedstate |
824 $ cat << EOF > .hg/shelvedstate |
825 > 1 |
825 > 1 |
826 > ashelve |
826 > ashelve |
827 > 8b058dae057a5a78f393f4535d9e363dd5efac9d |
827 > 8b058dae057a5a78f393f4535d9e363dd5efac9d |
858 temporarily committing pending changes (restore with 'hg unshelve --abort') |
858 temporarily committing pending changes (restore with 'hg unshelve --abort') |
859 rebasing shelved changes |
859 rebasing shelved changes |
860 merging a |
860 merging a |
861 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
861 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
862 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
862 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
863 [1] |
863 [240] |
864 $ hg abort |
864 $ hg abort |
865 unshelve of 'default' aborted |
865 unshelve of 'default' aborted |
866 |
866 |
867 Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve) |
867 Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve) |
868 |
868 |
875 temporarily committing pending changes (restore with 'hg unshelve --abort') |
875 temporarily committing pending changes (restore with 'hg unshelve --abort') |
876 rebasing shelved changes |
876 rebasing shelved changes |
877 merging a |
877 merging a |
878 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
878 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
879 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
879 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
880 [1] |
880 [240] |
881 $ cat .hg/shelved/default.shelve |
881 $ cat .hg/shelved/default.shelve |
882 node=82e0cb9893247d12667017593ce1e5655860f1ac |
882 node=82e0cb9893247d12667017593ce1e5655860f1ac |
883 $ hg abort |
883 $ hg abort |
884 unshelve of 'default' aborted |
884 unshelve of 'default' aborted |
885 |
885 |
903 temporarily committing pending changes (restore with 'hg unshelve --abort') |
903 temporarily committing pending changes (restore with 'hg unshelve --abort') |
904 rebasing shelved changes |
904 rebasing shelved changes |
905 merging a |
905 merging a |
906 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
906 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
907 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
907 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
908 [1] |
908 [240] |
909 |
909 |
910 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r . |
910 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r . |
911 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000 |
911 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000 |
912 $ hg merge --abort |
912 $ hg merge --abort |
913 abort: cannot abort merge with unshelve in progress |
913 abort: cannot abort merge with unshelve in progress |
932 $ hg shelve -q |
932 $ hg shelve -q |
933 $ echo "this is in wdir, conflicts with shelve" >> foo |
933 $ echo "this is in wdir, conflicts with shelve" >> foo |
934 $ hg unshelve -q |
934 $ hg unshelve -q |
935 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
935 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
936 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
936 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
937 [1] |
937 [240] |
938 $ cat foo |
938 $ cat foo |
939 r0 |
939 r0 |
940 <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit |
940 <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit |
941 this is in wdir, conflicts with shelve |
941 this is in wdir, conflicts with shelve |
942 ======= |
942 ======= |