doc/common.txt
author Greg Ward <greg@gerg.ca>
Fri, 30 Sep 2011 21:58:54 -0400
changeset 15183 59e8bc22506e
parent 9162 2399362b3bb0
permissions -rw-r--r--
rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9162
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     1
.. Common link and substitution definitions.
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     2
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     3
.. |hg(1)| replace:: **hg**\ (1)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     4
.. _hg(1): hg.1.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     5
.. |hgrc(5)| replace:: **hgrc**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     6
.. _hgrc(5): hgrc.5.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     7
.. |hgignore(5)| replace:: **hgignore**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     8
.. _hgignore(5): hgignore.5.html