Mercurial > evolve
changeset 6079:0d8d805fadbb stable
pick: mention topic override when there's an active topic
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 13 Oct 2021 15:04:21 +0530 |
| parents | f49e5fa3ae0e |
| children | 98864c7f9619 |
| files | hgext3rd/evolve/cmdrewrite.py tests/test-pick.t |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Fri Jul 23 13:08:56 2021 +0530 +++ b/hgext3rd/evolve/cmdrewrite.py Wed Oct 13 15:04:21 2021 +0530 @@ -1341,7 +1341,10 @@ _(b'[OPTION]... [-r] REV'), **compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT')) def cmdpick(ui, repo, *revs, **opts): - """move a commit on the top of working directory parent and updates to it.""" + """move a commit onto the working directory parent and update to it. + + If there is an active topic, it will be used for the resulting changeset. + """ cont = opts.get('continue') abort = opts.get('abort')
--- a/tests/test-pick.t Fri Jul 23 13:08:56 2021 +0530 +++ b/tests/test-pick.t Wed Oct 13 15:04:21 2021 +0530 @@ -29,7 +29,9 @@ aliases: grab - move a commit on the top of working directory parent and updates to it. + move a commit onto the working directory parent and update to it. + + If there is an active topic, it will be used for the resulting changeset. options: