Show More
@@ -3541,7 +3541,8 b' def identify(ui, repo, source=None, rev=' | |||
|
3541 | 3541 | 'meaning as the corresponding patch option'), _('NUM')), |
|
3542 | 3542 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
3543 | 3543 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3544 | ('f', 'force', None, _('skip check for outstanding uncommitted changes')), | |
|
3544 | ('f', 'force', None, | |
|
3545 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
|
3545 | 3546 | ('', 'no-commit', None, |
|
3546 | 3547 | _("don't commit, just update the working directory")), |
|
3547 | 3548 | ('', 'bypass', None, |
@@ -3558,8 +3559,8 b' def import_(ui, repo, patch1=None, *patc' | |||
|
3558 | 3559 | Import a list of patches and commit them individually (unless |
|
3559 | 3560 | --no-commit is specified). |
|
3560 | 3561 | |
|
3561 |
|
|
|
3562 | will abort unless given the -f/--force flag. | |
|
3562 | Because import first applies changes to the working directory, | |
|
3563 | import will abort if there are outstanding changes. | |
|
3563 | 3564 | |
|
3564 | 3565 | You can import a patch straight from a mail message. Even patches |
|
3565 | 3566 | as attachments work (to use the body part, it must have type |
@@ -5013,7 +5014,7 b' def revert(ui, repo, *pats, **opts):' | |||
|
5013 | 5014 | @command('rollback', dryrunopts + |
|
5014 | 5015 | [('f', 'force', False, _('ignore safety measures'))]) |
|
5015 | 5016 | def rollback(ui, repo, **opts): |
|
5016 |
"""roll back the last transaction ( |
|
|
5017 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
|
5017 | 5018 | |
|
5018 | 5019 | This command should be used with care. There is only one level of |
|
5019 | 5020 | rollback, and there is no way to undo a rollback. It will also |
@@ -324,7 +324,6 b' Testing -h/--help:' | |||
|
324 | 324 | rename rename files; equivalent of copy + remove |
|
325 | 325 | resolve redo merges or set/view the merge status of files |
|
326 | 326 | revert restore files to their checkout state |
|
327 | rollback roll back the last transaction (dangerous) | |
|
328 | 327 | root print the root (top) of the current working directory |
|
329 | 328 | serve start stand-alone webserver |
|
330 | 329 | showconfig show combined config settings from all hgrc files |
@@ -407,7 +406,6 b' Testing -h/--help:' | |||
|
407 | 406 | rename rename files; equivalent of copy + remove |
|
408 | 407 | resolve redo merges or set/view the merge status of files |
|
409 | 408 | revert restore files to their checkout state |
|
410 | rollback roll back the last transaction (dangerous) | |
|
411 | 409 | root print the root (top) of the current working directory |
|
412 | 410 | serve start stand-alone webserver |
|
413 | 411 | showconfig show combined config settings from all hgrc files |
@@ -89,7 +89,6 b' Short help:' | |||
|
89 | 89 | rename rename files; equivalent of copy + remove |
|
90 | 90 | resolve redo merges or set/view the merge status of files |
|
91 | 91 | revert restore files to their checkout state |
|
92 | rollback roll back the last transaction (dangerous) | |
|
93 | 92 | root print the root (top) of the current working directory |
|
94 | 93 | serve start stand-alone webserver |
|
95 | 94 | showconfig show combined config settings from all hgrc files |
@@ -166,7 +165,6 b' Short help:' | |||
|
166 | 165 | rename rename files; equivalent of copy + remove |
|
167 | 166 | resolve redo merges or set/view the merge status of files |
|
168 | 167 | revert restore files to their checkout state |
|
169 | rollback roll back the last transaction (dangerous) | |
|
170 | 168 | root print the root (top) of the current working directory |
|
171 | 169 | serve start stand-alone webserver |
|
172 | 170 | showconfig show combined config settings from all hgrc files |
@@ -652,7 +650,6 b' Test that default list of commands omits' | |||
|
652 | 650 | rename rename files; equivalent of copy + remove |
|
653 | 651 | resolve redo merges or set/view the merge status of files |
|
654 | 652 | revert restore files to their checkout state |
|
655 | rollback roll back the last transaction (dangerous) | |
|
656 | 653 | root print the root (top) of the current working directory |
|
657 | 654 | serve start stand-alone webserver |
|
658 | 655 | showconfig show combined config settings from all hgrc files |
@@ -1387,13 +1384,6 b' Dish up an empty repo; serve it cold.' | |||
|
1387 | 1384 | restore files to their checkout state |
|
1388 | 1385 | </td></tr> |
|
1389 | 1386 | <tr><td> |
|
1390 | <a href="/help/rollback"> | |
|
1391 | rollback | |
|
1392 | </a> | |
|
1393 | </td><td> | |
|
1394 | roll back the last transaction (dangerous) | |
|
1395 | </td></tr> | |
|
1396 | <tr><td> | |
|
1397 | 1387 | <a href="/help/root"> |
|
1398 | 1388 | root |
|
1399 | 1389 | </a> |
General Comments 0
You need to be logged in to leave comments.
Login now