diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6210,6 +6210,12 @@ Timestamp in seconds is used to decide order of backups. More than ``maxbackups`` backups are kept, if same timestamp prevents from deciding exact order of them, for safety. + + Selected changes can be unshelved with ``--interactive`` flag. The repo + is updated with the requested changes by the user and the stored shelve + is modified with the remaining changes. Note that the user will get into + conflicts whenever the whole shelve has conflicts with the repo + regardless of the changes they have requested. """ with repo.wlock(): return shelvemod.dounshelve(ui, repo, *shelved, **opts)