Mercurial > hg > mercurial-crew-with-dirclash
changeset 4683:8c3d449ecc63
Merge with main
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 23 Jun 2007 12:05:00 +0200 |
parents | 51ec5e069505 (diff) dc5920ea12f8 (current diff) |
children | 849f011dbf79 06a0e0557edc |
files | |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2398,7 +2398,9 @@ def rollback(ui, repo): unbundle This command should be used with care. There is only one level of - rollback, and there is no way to undo a rollback. + rollback, and there is no way to undo a rollback. It will also + restore the dirstate at the time of the last transaction, which + may lose subsequent dirstate changes. This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction