Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 52505:68dc6cecca32
graft: add a `--to` flag grafting in memory
See inline documentation for details.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 02 Dec 2024 02:45:41 +0100 |
parents | 04c3fb885fb6 |
children | 700086cf336d |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Dec 02 02:41:57 2024 +0100 +++ b/mercurial/commands.py Mon Dec 02 02:45:41 2024 +0100 @@ -2971,6 +2971,12 @@ _(b'base revision when doing the graft merge (ADVANCED)'), _(b'REV'), ), + ( + b'', + b'to', + b'', + _(b'graft to this destination, in memory (EXPERIMENTAL)'), + ), (b'c', b'continue', False, _(b'resume interrupted graft')), (b'', b'stop', False, _(b'stop interrupted graft')), (b'', b'abort', False, _(b'abort interrupted graft')), @@ -3061,6 +3067,16 @@ .. container:: verbose + The experimental --to option allow to graft a revision in memory, + independently from the working copy. Merge conflict are not currenly + supported and the operation will be aborted if the configured tool + cannot handle the conflict that might be encountered. + + As the operation is performence in memory, the on disk file will not be + modified and some hooks might not be run. + + .. container:: verbose + Examples: - copy a single change to the stable branch and edit its description::