equal
deleted
inserted
replaced
1554 # driver has changed, and we want to be able to bypass it when overwrite is |
1554 # driver has changed, and we want to be able to bypass it when overwrite is |
1555 # True |
1555 # True |
1556 usemergedriver = not overwrite and mergeactions and ms.mergedriver |
1556 usemergedriver = not overwrite and mergeactions and ms.mergedriver |
1557 |
1557 |
1558 if usemergedriver: |
1558 if usemergedriver: |
|
1559 if wctx.isinmemory(): |
|
1560 raise error.InMemoryMergeConflictsError("in-memory merge does not " |
|
1561 "support mergedriver") |
1559 ms.commit() |
1562 ms.commit() |
1560 proceed = driverpreprocess(repo, ms, wctx, labels=labels) |
1563 proceed = driverpreprocess(repo, ms, wctx, labels=labels) |
1561 # the driver might leave some files unresolved |
1564 # the driver might leave some files unresolved |
1562 unresolvedf = set(ms.unresolved()) |
1565 unresolvedf = set(ms.unresolved()) |
1563 if not proceed: |
1566 if not proceed: |