Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 52544:700086cf336d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: minor copyediting of the help text for the `--to` argument It looks like `rebase` makes frequent use of `in-memory` (with the dash), so do that here too.
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 16 Dec 2024 01:52:32 -0500
parents 68dc6cecca32
children 73ab542565e0
comparison
equal deleted inserted replaced
52543:20690cff1bd8 52544:700086cf336d
2973 ), 2973 ),
2974 ( 2974 (
2975 b'', 2975 b'',
2976 b'to', 2976 b'to',
2977 b'', 2977 b'',
2978 _(b'graft to this destination, in memory (EXPERIMENTAL)'), 2978 _(b'graft to this destination, in-memory (EXPERIMENTAL)'),
2979 ), 2979 ),
2980 (b'c', b'continue', False, _(b'resume interrupted graft')), 2980 (b'c', b'continue', False, _(b'resume interrupted graft')),
2981 (b'', b'stop', False, _(b'stop interrupted graft')), 2981 (b'', b'stop', False, _(b'stop interrupted graft')),
2982 (b'', b'abort', False, _(b'abort interrupted graft')), 2982 (b'', b'abort', False, _(b'abort interrupted graft')),
2983 (b'e', b'edit', False, _(b'invoke editor on commit messages')), 2983 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3065 For using non-ancestors as the base to backout changes, see the backout 3065 For using non-ancestors as the base to backout changes, see the backout
3066 command and the hidden --parent option. 3066 command and the hidden --parent option.
3067 3067
3068 .. container:: verbose 3068 .. container:: verbose
3069 3069
3070 The experimental --to option allow to graft a revision in memory, 3070 The experimental --to option allows grafting a revision in-memory,
3071 independently from the working copy. Merge conflict are not currenly 3071 independent of the working copy. Merge conflicts are not currently
3072 supported and the operation will be aborted if the configured tool 3072 supported, and the operation will be aborted if the configured tool
3073 cannot handle the conflict that might be encountered. 3073 cannot handle the conflicts that might be encountered.
3074 3074
3075 As the operation is performence in memory, the on disk file will not be 3075 As the operation is performed in-memory, the on-disk files will not be
3076 modified and some hooks might not be run. 3076 modified, and some hooks might not be run.
3077 3077
3078 .. container:: verbose 3078 .. container:: verbose
3079 3079
3080 Examples: 3080 Examples:
3081 3081