This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 137699f2 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

pick: make sure the topic of cset being picked doesn't change

Now we feed the "current active topic" to context being committed only
when it doesn't already have a topic.

Changes in test file reflect a fix in pick command where the topic of
picked cset got changed to the topic of wdir parent.
parent 14efc9f6d25b
Pipeline #18282 passed with stage
in 7 minutes and 49 seconds
......@@ -494,7 +494,7 @@ def reposetup(ui, repo):
if isinstance(ctx, context.workingcommitctx):
current = self.currenttopic
if current:
if current and TOPIC_KEY not in ctx.extra():
ctx.extra()[TOPIC_KEY] = current
if (isinstance(ctx, context.memctx)
and ctx.extra().get(b'amend_source')
......
......@@ -77,9 +77,8 @@ actual test to check pick keep the topic of cset being picked
$ hg pick -r 'desc("c_B")'
picking 1:f417729b010f "c_B"
XXX: it dropped the original topic "car" of the picked cset
$ hg log -G
@ 3:6bbfc47fe0fc: c_B [topic: car]
@ 3:17b8291a877c: c_B [topic: bar]
|
o 2:dc6ff489e857: c_C [topic: car]
|
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment