Mercurial > hg
comparison mercurial/commands.py @ 26476:fffc7416e579
backout: add reference to revert
| author | Mathias De Maré <mathias.demare@gmail.com> |
|---|---|
| date | Mon, 05 Oct 2015 07:11:48 +0200 |
| parents | 4b0fc75f9403 |
| children | d69245af4dbe |
comparison
equal
deleted
inserted
replaced
| 26475:efd57cd6fd1d | 26476:fffc7416e579 |
|---|---|
| 494 to specifying --merge followed by :hg:`update --clean .` to | 494 to specifying --merge followed by :hg:`update --clean .` to |
| 495 cancel the merge and leave the child of REV as a head to be | 495 cancel the merge and leave the child of REV as a head to be |
| 496 merged separately. | 496 merged separately. |
| 497 | 497 |
| 498 See :hg:`help dates` for a list of formats valid for -d/--date. | 498 See :hg:`help dates` for a list of formats valid for -d/--date. |
| 499 | |
| 500 See :hg:`help revert` for a way to restore files to the state | |
| 501 of another revision. | |
| 499 | 502 |
| 500 Returns 0 on success, 1 if nothing to backout or there are unresolved | 503 Returns 0 on success, 1 if nothing to backout or there are unresolved |
| 501 files. | 504 files. |
| 502 ''' | 505 ''' |
| 503 if rev and node: | 506 if rev and node: |