D6596: unshelve: add interactive mode

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Thu Jul 18 13:19:12 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in test-shelve.t:1354
> We only pass `-i` if we want to do the unshelve interactively again. It's not mandatory to do that. After an interactive shelve, the stored remaining shelve is same as a normal shelve. We can unshelve it without the `-i`. So, I don't think we have to do that.

Looking at the test case:

User wants to interactively unshelve, runs `hg unshelve -i`. They hit conflicts, resolve conflicts, and then run `hg unshelve --continue`.

Here, user intended to do an interactive unshelve, and having conflicts should not change what user wanted. Also this is similar to other commands. We preserve the flags which user passed and follow them when the operation is continued.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6596/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6596

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list