D6169: unshelve: disable unshelve during merge (issue5123)

Yuya Nishihara yuya at tcha.org
Mon Mar 25 18:28:04 EDT 2019

>   As stated in the issue5123, unshelve can destroy the second parent of
>   the context when tried to unshelve with an uncommitted merge. This
>   patch makes unshelve to abort when called with an uncommitted merge.

Is it difficult to fix unshelve to not lose merge parents?


More information about the Mercurial-devel mailing list