Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 42644:0795bbe8ed19 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: add help text on --interactive in verbose mode This is a follow-up patch to rHG9eace8d6d537. This modifies the help text of unshelve in verbose mode to mention the details about `--interactive` flag. Differential Revision: https://phab.mercurial-scm.org/D6676
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Tue, 23 Jul 2019 12:03:24 +0530
parents 55d8329ba509
children 51a2e3102db2
comparison
equal deleted inserted replaced
42643:ce52377102db 42644:0795bbe8ed19
6208 .. container:: verbose 6208 .. container:: verbose
6209 6209
6210 Timestamp in seconds is used to decide order of backups. More 6210 Timestamp in seconds is used to decide order of backups. More
6211 than ``maxbackups`` backups are kept, if same timestamp 6211 than ``maxbackups`` backups are kept, if same timestamp
6212 prevents from deciding exact order of them, for safety. 6212 prevents from deciding exact order of them, for safety.
6213
6214 Selected changes can be unshelved with ``--interactive`` flag.
6215 The working directory is updated with the selected changes, and
6216 only the unselected changes remain shelved.
6217 Note: The whole shelve is applied to working directory first before
6218 running interactively. So, this will bring up all the conflicts between
6219 working directory and the shelve, irrespective of which changes will be
6220 unshelved.
6213 """ 6221 """
6214 with repo.wlock(): 6222 with repo.wlock():
6215 return shelvemod.dounshelve(ui, repo, *shelved, **opts) 6223 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
6216 6224
6217 statemod.addunfinished( 6225 statemod.addunfinished(