Mercurial > hg
comparison mercurial/subrepoutil.py @ 45447:e7c8a5030a90
merge: show number of ancestors in bid merge debug notes
A good number of times, we don't generate an action for a file in
manifestmerge() which can result in bid merge doing the wrong thing.
Mentioning the number of ancestors from which we are bidding will help spot such
cases where we are not returning an action.
Differential Revision: https://phab.mercurial-scm.org/D8967
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 26 Aug 2020 17:24:22 +0530 |
parents | 668af67bfd18 |
children | 271dfcb98544 |
comparison
equal
deleted
inserted
replaced
45446:00e4e97c6bc8 | 45447:e7c8a5030a90 |
---|