Mercurial > evolve
comparison tests/test-pick.t @ 6655:81fe0a498447 stable
topic: internal config option to fix hg pick behavior (issue6406)
After some consideration, hg pick was made to always use current topic (and
topic namespace), even if it's not set, in which case the resulting changeset
will not have any topic.
Previously the intended behavior was to only update topic if there was an
active topic, and not touch commit extras at all otherwise. That wasn't ideal,
since pick doesn't change active topic, and amending the just-picked commit
would unset its topic without clear user's intent to do so and to their
surprise.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 27 Jan 2024 17:36:39 -0300 |
parents | 50f55918b417 |
children | e2fbec28654c 195941260a67 |
comparison
equal
deleted
inserted
replaced
6654:968b9651b1f7 | 6655:81fe0a498447 |
---|---|
30 | 30 |
31 aliases: grab | 31 aliases: grab |
32 | 32 |
33 move a commit onto the working directory parent and update to it. | 33 move a commit onto the working directory parent and update to it. |
34 | 34 |
35 If there is an active topic, it will be used for the resulting changeset. | 35 The resulting changeset will have the current active topic. If there's no |
36 active topic set, the resulting changeset will also not have any topic. | |
36 | 37 |
37 options: | 38 options: |
38 | 39 |
39 -r --rev REV revision to pick | 40 -r --rev REV revision to pick |
40 -c --continue continue interrupted pick | 41 -c --continue continue interrupted pick |