368 def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force, |
368 def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force, |
369 partial, acceptremote=False): |
369 partial, acceptremote=False): |
370 overwrite = force and not branchmerge |
370 overwrite = force and not branchmerge |
371 actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, |
371 actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, |
372 acceptremote) |
372 acceptremote) |
|
373 |
|
374 if overwrite: |
|
375 return actions |
|
376 |
373 processed = [] |
377 processed = [] |
374 |
378 |
375 for action in actions: |
379 for action in actions: |
376 if overwrite: |
|
377 processed.append(action) |
|
378 continue |
|
379 f, m, args, msg = action |
380 f, m, args, msg = action |
380 |
381 |
381 splitstandin = lfutil.splitstandin(f) |
382 splitstandin = lfutil.splitstandin(f) |
382 if (m == "g" and splitstandin is not None and |
383 if (m == "g" and splitstandin is not None and |
383 splitstandin in p1 and f in p2): |
384 splitstandin in p1 and f in p2): |