Show More
@@ -4086,7 +4086,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
4086 | ] + walkopts + dryrunopts, |
|
4086 | ] + walkopts + dryrunopts, | |
4087 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4087 | _('[OPTION]... [-r REV] [NAME]...')) | |
4088 | def revert(ui, repo, *pats, **opts): |
|
4088 | def revert(ui, repo, *pats, **opts): | |
4089 | """restore individual files or directories to an earlier state |
|
4089 | """restore files to their checkout state | |
4090 |
|
4090 | |||
4091 | .. note:: |
|
4091 | .. note:: | |
4092 | This command is most likely not what you are looking for. |
|
4092 | This command is most likely not what you are looking for. |
@@ -316,7 +316,7 b' Testing -h/--help:' | |||||
316 | remove remove the specified files on the next commit |
|
316 | remove remove the specified files on the next commit | |
317 | rename rename files; equivalent of copy + remove |
|
317 | rename rename files; equivalent of copy + remove | |
318 | resolve redo merges or set/view the merge status of files |
|
318 | resolve redo merges or set/view the merge status of files | |
319 |
revert restore |
|
319 | revert restore files to their checkout state | |
320 | rollback roll back the last transaction (dangerous) |
|
320 | rollback roll back the last transaction (dangerous) | |
321 | root print the root (top) of the current working directory |
|
321 | root print the root (top) of the current working directory | |
322 | serve start stand-alone webserver |
|
322 | serve start stand-alone webserver | |
@@ -396,7 +396,7 b' Testing -h/--help:' | |||||
396 | remove remove the specified files on the next commit |
|
396 | remove remove the specified files on the next commit | |
397 | rename rename files; equivalent of copy + remove |
|
397 | rename rename files; equivalent of copy + remove | |
398 | resolve redo merges or set/view the merge status of files |
|
398 | resolve redo merges or set/view the merge status of files | |
399 |
revert restore |
|
399 | revert restore files to their checkout state | |
400 | rollback roll back the last transaction (dangerous) |
|
400 | rollback roll back the last transaction (dangerous) | |
401 | root print the root (top) of the current working directory |
|
401 | root print the root (top) of the current working directory | |
402 | serve start stand-alone webserver |
|
402 | serve start stand-alone webserver |
@@ -86,7 +86,7 b' Short help:' | |||||
86 | remove remove the specified files on the next commit |
|
86 | remove remove the specified files on the next commit | |
87 | rename rename files; equivalent of copy + remove |
|
87 | rename rename files; equivalent of copy + remove | |
88 | resolve redo merges or set/view the merge status of files |
|
88 | resolve redo merges or set/view the merge status of files | |
89 |
revert restore |
|
89 | revert restore files to their checkout state | |
90 | rollback roll back the last transaction (dangerous) |
|
90 | rollback roll back the last transaction (dangerous) | |
91 | root print the root (top) of the current working directory |
|
91 | root print the root (top) of the current working directory | |
92 | serve start stand-alone webserver |
|
92 | serve start stand-alone webserver | |
@@ -160,7 +160,7 b' Short help:' | |||||
160 | remove remove the specified files on the next commit |
|
160 | remove remove the specified files on the next commit | |
161 | rename rename files; equivalent of copy + remove |
|
161 | rename rename files; equivalent of copy + remove | |
162 | resolve redo merges or set/view the merge status of files |
|
162 | resolve redo merges or set/view the merge status of files | |
163 |
revert restore |
|
163 | revert restore files to their checkout state | |
164 | rollback roll back the last transaction (dangerous) |
|
164 | rollback roll back the last transaction (dangerous) | |
165 | root print the root (top) of the current working directory |
|
165 | root print the root (top) of the current working directory | |
166 | serve start stand-alone webserver |
|
166 | serve start stand-alone webserver | |
@@ -673,7 +673,7 b' Test that default list of commands omits' | |||||
673 | remove remove the specified files on the next commit |
|
673 | remove remove the specified files on the next commit | |
674 | rename rename files; equivalent of copy + remove |
|
674 | rename rename files; equivalent of copy + remove | |
675 | resolve redo merges or set/view the merge status of files |
|
675 | resolve redo merges or set/view the merge status of files | |
676 |
revert restore |
|
676 | revert restore files to their checkout state | |
677 | rollback roll back the last transaction (dangerous) |
|
677 | rollback roll back the last transaction (dangerous) | |
678 | root print the root (top) of the current working directory |
|
678 | root print the root (top) of the current working directory | |
679 | serve start stand-alone webserver |
|
679 | serve start stand-alone webserver |
General Comments 0
You need to be logged in to leave comments.
Login now