equal
deleted
inserted
replaced
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 |