equal
deleted
inserted
replaced
6217 return shelvemod.dounshelve(ui, repo, *shelved, **opts) |
6217 return shelvemod.dounshelve(ui, repo, *shelved, **opts) |
6218 |
6218 |
6219 statemod.addunfinished( |
6219 statemod.addunfinished( |
6220 'unshelve', fname='shelvedstate', continueflag=True, |
6220 'unshelve', fname='shelvedstate', continueflag=True, |
6221 abortfunc=shelvemod.hgabortunshelve, |
6221 abortfunc=shelvemod.hgabortunshelve, |
|
6222 continuefunc=shelvemod.hgcontinueunshelve, |
6222 cmdmsg=_('unshelve already in progress'), |
6223 cmdmsg=_('unshelve already in progress'), |
6223 ) |
6224 ) |
6224 |
6225 |
6225 @command('update|up|checkout|co', |
6226 @command('update|up|checkout|co', |
6226 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
6227 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |