Mercurial > evolve
comparison docs/user-guide.rst @ 4919:8beb44234b33 stable
docs: typo in user-guide.rst
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 26 Oct 2019 22:43:06 +0700 |
parents | 561e97db1cf7 |
children | d1066fb2c95a |
comparison
equal
deleted
inserted
replaced
4915:5113b38cb677 | 4919:8beb44234b33 |
---|---|
568 Sometimes you might obsolete a changeset, and then change your mind. You'll | 568 Sometimes you might obsolete a changeset, and then change your mind. You'll |
569 probably start looking for an “unobsolete” command to restore a changeset | 569 probably start looking for an “unobsolete” command to restore a changeset |
570 to normal state. For complicated implementation reasons, that command | 570 to normal state. For complicated implementation reasons, that command |
571 doesn't exist. (If you have already pushed an obsolescence marker to | 571 doesn't exist. (If you have already pushed an obsolescence marker to |
572 another repo, then Mercurial would need a way to revoke that remote | 572 another repo, then Mercurial would need a way to revoke that remote |
573 obsolesence marker. That's a hard problem.) | 573 obsolescence marker. That's a hard problem.) |
574 | 574 |
575 Instead, ``evolve`` provides a ``touch`` command to resurrect an | 575 Instead, ``evolve`` provides a ``touch`` command to resurrect an |
576 obsolete changeset. An unexpected quirk: you almost certainly need to | 576 obsolete changeset. An unexpected quirk: you almost certainly need to |
577 use ``--hidden``, since obsolete changesets tend to be hidden, and you | 577 use ``--hidden``, since obsolete changesets tend to be hidden, and you |
578 can't reference a hidden changeset otherwise. Typical usage thus looks | 578 can't reference a hidden changeset otherwise. Typical usage thus looks |