Mercurial > evolve

diff CHANGELOG @ 4704:5f90eb8fd63c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/CHANGELOG	Sun Apr 14 12:55:46 2019 +0530
+++ b/CHANGELOG	Tue Jun 25 21:54:22 2019 +0530
@@ -7,6 +7,8 @@
   * evolve: use the same wording as core in case of unresolved conflict
   * evolve: minor output message improvements
   * evolve: improve `hg evolve --all` behavior when "." is obsolete
+  * topic: fix confusion in branch heads checking logic
+
 
 9.0.0 -- 2019-06-06
 -------------------