equal
deleted
inserted
replaced
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( |