comparison mercurial/tagmerge.py @ 44038:0750cbffdb3b

movedirstate: get copies from dirstate before setting parents Setting dirstate parents can modify the copies recorded in the dirstate when there are two dirstate parents. I don't think we ever call movedirstate() when there is more than one parent, but it seems clearer to get the copies from the dirstate first anyway. Differential Revision: https://phab.mercurial-scm.org/D7800
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 27 Dec 2019 12:41:56 -0800
parents 687b865b95ad
children 89a2afe31e82
comparison
equal deleted inserted replaced
44037:98944715a02c 44038:0750cbffdb3b