Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 15747:e251250ac20b
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 29 Dec 2011 14:45:18 -0600 |
parents | 988409e44a76 5a20115e7397 |
children | 371cff9610cd |
comparison
equal
deleted
inserted
replaced
15742:65df60a3f96b | 15747:e251250ac20b |
---|---|
4900 - import | 4900 - import |
4901 - pull | 4901 - pull |
4902 - push (with this repository as the destination) | 4902 - push (with this repository as the destination) |
4903 - unbundle | 4903 - unbundle |
4904 | 4904 |
4905 It's possible to lose data with rollback: commit, update back to | 4905 To avoid permanent data loss, rollback will refuse to rollback a |
4906 an older changeset, and then rollback. The update removes the | 4906 commit transaction if it isn't checked out. Use --force to |
4907 changes you committed from the working directory, and rollback | 4907 override this protection. |
4908 removes them from history. To avoid data loss, you must pass | |
4909 --force in this case. | |
4910 | 4908 |
4911 This command is not intended for use on public repositories. Once | 4909 This command is not intended for use on public repositories. Once |
4912 changes are visible for pull by other users, rolling a transaction | 4910 changes are visible for pull by other users, rolling a transaction |
4913 back locally is ineffective (someone else may already have pulled | 4911 back locally is ineffective (someone else may already have pulled |
4914 the changes). Furthermore, a race is possible with readers of the | 4912 the changes). Furthermore, a race is possible with readers of the |