comparison tests/test-topic.t @ 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 e15dc6defc99
children 5ad6d92f125c f9743b13de6d fcefc052a3b1
comparison
equal deleted inserted replaced
4703:e15dc6defc99 4704:5f90eb8fd63c
1082 $ hg topic foo -r . 1082 $ hg topic foo -r .
1083 switching to topic foo 1083 switching to topic foo
1084 changed topic on 1 changesets to "foo" 1084 changed topic on 1 changesets to "foo"
1085 1085
1086 Try to put a tag on current rev which also has an active topic: 1086 Try to put a tag on current rev which also has an active topic:
1087 XXX: it shouldn't have aborted here
1088 $ hg tag 1.0 1087 $ hg tag 1.0
1089 abort: working directory is not at a branch head (use -f to force)
1090 [255]
1091 $ hg tags 1088 $ hg tags
1092 tip 2:3bbb3fdb2546 1089 tip 3:9efc5c3ac635
1090 1.0 2:3bbb3fdb2546
1093 1091
1094 $ cd .. 1092 $ cd ..