Mercurial > hg
comparison mercurial/cffi/bdiffbuild.py @ 42703:073cfff9aaef
unshelve: delete shelvedstate after a successful unshelve --continue
`unshelve --continue` was preventing the deletion of `shelvedstate` on
a partial `unshelve`. Ideally, `shelvedstate` should be deleted after
a successful `unshelve`. Now, the behavior of `unshelve --continue`
will be as follows in interactive mode:
1] The user tried to `unshelve` changes interactively but, ran into
conflicts.
2] They resolved the conflicts and triggered `unshelve --continue`
but, unshelved changes partially.
3] Now, on trying to do `unshelve --continue` again will abort as
the last `unshelve` was successful and we are deleting the
`shelvedstate`.
4] If they want to unshelve the remaining shelved change, they
need to trigger `unshelve` without `--continue`.
Differential Revision: https://phab.mercurial-scm.org/D6694
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Thu, 25 Jul 2019 22:01:15 +0530 |
parents | 0585337ea787 |
children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
42702:4814d993fe21 | 42703:073cfff9aaef |
---|