equal
deleted
inserted
replaced
845 unshelve of 'default' aborted |
845 unshelve of 'default' aborted |
846 |
846 |
847 #endif |
847 #endif |
848 |
848 |
849 $ cd .. |
849 $ cd .. |
|
850 |
|
851 Block merge abort when unshelve in progress(issue6160) |
|
852 ------------------------------------------------------ |
|
853 |
|
854 $ hg init a |
|
855 $ cd a |
|
856 $ echo foo > a ; hg commit -qAm "initial commit" |
|
857 $ echo bar > a |
|
858 $ hg shelve |
|
859 shelved as default |
|
860 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
861 $ echo foobar > a |
|
862 $ hg unshelve |
|
863 unshelving change 'default' |
|
864 temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
865 rebasing shelved changes |
|
866 merging a |
|
867 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
868 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
869 [1] |
|
870 |
|
871 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r . |
|
872 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000 |
|
873 $ hg merge --abort |
|
874 abort: cannot abort merge with unshelve in progress |
|
875 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
|
876 [255] |
|
877 |
|
878 $ hg unshelve --abort |
|
879 unshelve of 'default' aborted |
|
880 |
|
881 $ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r . |
|
882 @ initial commit test 1970-01-01 00:00 +0000 |
|
883 |
|
884 $ cd .. |