mercurial - Use "hg unshelve" like unstashing with Git -

mercurial - Use "hg unshelve" like unstashing with Git -

when invoking hg unshelve --keep , conflict, need resolve conflict , invoke hg unshelve --continue --keep again. why lastly step necessary? , why can't invoke hg unshelve --continue --keep straight without resolving commit - out of unshelving state?

c:\temp\hg test>hg st m new.txt c:\temp\hg test>hg commit -m "fjdjkfs" c:\temp\hg test>hg unshelve --keep unshelving alter 'shelve' adding changesets adding manifests adding file changes added 1 changesets 1 changes 1 files (+1 heads) merging new.txt warning: conflicts during merge. merging new.txt incomplete! (edit conflicts, utilize 'hg resolve --mark') unresolved conflicts (see 'hg resolve', 'hg unshelve --continue') c:\temp\hg test>hg st m new.txt ? new.txt.orig c:\temp\hg test>hg unshelve --keep --continue abort: unresolved conflicts, can't go on (see 'hg resolve', 'hg unshelve --continue') c:\temp\hg test>hg resolve --mark c:\temp\hg test>hg unshelve --keep --continue no changes needed new.txt unshelve of 'shelve' finish c:\temp\hg test>hg st warning: ignoring unknown working parent 11667b875a2d! ? new.txt.orig

this seemed problem mercurial version using. latest version 3.4 works expected.

mercurial shelve unshelve