Mercurial > evolve
comparison CHANGELOG @ 4704:5f90eb8fd63c
evolve: fix confusion in branch heads checking logic when topic in play
To provide some context, when topics are in play the branchmap cache
we store contains the branch info of a rev as "branch:topic" format IIUC.
Assuming that is right, now in present code we don't actually cover
this part that "when looking for branch heads where we also have active
topic we should look for branch='branch_name:topic' instead".
And we get wrong branch heads as a result.
This patch make sure that we pass right candidate to find branch heads
using branchmap.branchheads() by overriding the localrepo.branchheads()
Changes in test file reflect the fixed behavior.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Tue, 25 Jun 2019 21:54:22 +0530 |
| parents | 4c9f9dac8977 |
| children | de194ed973ba |
comparison
equal
deleted
inserted
replaced
| 4703:e15dc6defc99 | 4704:5f90eb8fd63c |
|---|---|
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * evolve: use the same wording as core in case of unresolved conflict | 7 * evolve: use the same wording as core in case of unresolved conflict |
| 8 * evolve: minor output message improvements | 8 * evolve: minor output message improvements |
| 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete | 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete |
| 10 * topic: fix confusion in branch heads checking logic | |
| 11 | |
| 10 | 12 |
| 11 9.0.0 -- 2019-06-06 | 13 9.0.0 -- 2019-06-06 |
| 12 ------------------- | 14 ------------------- |
| 13 | 15 |
| 14 * evolve: preserve the working directory after resolving instability (BC) | 16 * evolve: preserve the working directory after resolving instability (BC) |