comparison mercurial/tags.py @ 31653:32d998dc2a00

largefiles: omit updating newly added standin at linear merging Updating standin for newly added largefile is needed, only if same name largefile exists in destination context at linear merging. In such case, updated standin is used to detect divergence of largefile at overridefilemerge(). Otherwise, standin doesn't have any responsibility for its content (usually, it is empty).
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Mon, 27 Mar 2017 09:44:34 +0900
parents 37acdf027ae2
children 7d0459706716
comparison
equal deleted inserted replaced
31652:d5cbbee542eb 31653:32d998dc2a00