mercurial/commands.py
changeset 42560 70f1a84d0794
parent 42542 2e1d9414ff71
child 42568 f9da9d5f3f5a
equal deleted inserted replaced
42559:a80464e85ddd 42560:70f1a84d0794
  6207        Timestamp in seconds is used to decide order of backups. More
  6207        Timestamp in seconds is used to decide order of backups. More
  6208        than ``maxbackups`` backups are kept, if same timestamp
  6208        than ``maxbackups`` backups are kept, if same timestamp
  6209        prevents from deciding exact order of them, for safety.
  6209        prevents from deciding exact order of them, for safety.
  6210     """
  6210     """
  6211     with repo.wlock():
  6211     with repo.wlock():
  6212         return shelvemod._dounshelve(ui, repo, *shelved, **opts)
  6212         return shelvemod.dounshelve(ui, repo, *shelved, **opts)
  6213 
  6213 
  6214 @command('update|up|checkout|co',
  6214 @command('update|up|checkout|co',
  6215     [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
  6215     [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
  6216     ('c', 'check', None, _('require clean working directory')),
  6216     ('c', 'check', None, _('require clean working directory')),
  6217     ('m', 'merge', None, _('merge uncommitted changes')),
  6217     ('m', 'merge', None, _('merge uncommitted changes')),