Mercurial > hg
diff mercurial/commands.py @ 15744:5a20115e7397 stable
rollback: clarify --force text (issue3175)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 29 Dec 2011 14:02:18 -0600 |
parents | 32a6e00e4cfe |
children | e251250ac20b 1ef46bcd76f8 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Dec 28 00:01:48 2011 +0100 +++ b/mercurial/commands.py Thu Dec 29 14:02:18 2011 -0600 @@ -4863,11 +4863,9 @@ - push (with this repository as the destination) - unbundle - It's possible to lose data with rollback: commit, update back to - an older changeset, and then rollback. The update removes the - changes you committed from the working directory, and rollback - removes them from history. To avoid data loss, you must pass - --force in this case. + To avoid permanent data loss, rollback will refuse to rollback a + commit transaction if it isn't checked out. Use --force to + override this protection. This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction