Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 49889:3aa8e569478a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't pay for pathconflicts if there are none
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Wed, 04 Jan 2023 19:13:41 +0000
parents becd16690cbe
children c7624b1ac8b4
comparison
equal deleted inserted replaced
49888:445b4d819e9a 49889:3aa8e569478a
243 for f, args, msg in list( 243 for f, args, msg in list(
244 mresult.getactions([mergestatemod.ACTION_CREATED]) 244 mresult.getactions([mergestatemod.ACTION_CREATED])
245 ): 245 ):
246 backup = ( 246 backup = (
247 f in fileconflicts 247 f in fileconflicts
248 or f in pathconflicts 248 or pathconflicts
249 or any(p in pathconflicts for p in pathutil.finddirs(f)) 249 and (
250 f in pathconflicts
251 or any(p in pathconflicts for p in pathutil.finddirs(f))
252 )
250 ) 253 )
251 (flags,) = args 254 (flags,) = args
252 mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg) 255 mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg)
253 256
254 257