513 raise error.Abort(_("case-folding collision between " |
513 raise error.Abort(_("case-folding collision between " |
514 "%s and directory of %s") % (lastfull, f)) |
514 "%s and directory of %s") % (lastfull, f)) |
515 foldprefix = fold + '/' |
515 foldprefix = fold + '/' |
516 unfoldprefix = f + '/' |
516 unfoldprefix = f + '/' |
517 lastfull = f |
517 lastfull = f |
|
518 |
|
519 def driverpreprocess(repo, ms, wctx, labels=None): |
|
520 """run the preprocess step of the merge driver, if any |
|
521 |
|
522 This is currently not implemented -- it's an extension point.""" |
|
523 return True |
|
524 |
|
525 def driverconclude(repo, ms, wctx, labels=None): |
|
526 """run the conclude step of the merge driver, if any |
|
527 |
|
528 This is currently not implemented -- it's an extension point.""" |
|
529 return True |
518 |
530 |
519 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial, |
531 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial, |
520 acceptremote, followcopies): |
532 acceptremote, followcopies): |
521 """ |
533 """ |
522 Merge p1 and p2 with ancestor pa and generate merge action list |
534 Merge p1 and p2 with ancestor pa and generate merge action list |