comparison mercurial/simplemerge.py @ 48566:50de08904c63

merge: consider the file merged when using :merge-{local,other}

Returning `None` from `simplemerge()` means that the caller interprets
it as "no merge was necessary (because two sides matched)". See
6217040b2780 and issue2680 for some background. However,
`simplemerge()` shouldn't even get called in such scenarios, and
returning `None` means that the file is not considered merged, even
though the contents actually were. See the affected test cases.

Differential Revision: https://phab.mercurial-scm.org/D11999

48565:7ed4c4753891

    try:
        localtext = readctx(localctx)
        basetext = readctx(basectx)
        othertext = readctx(otherctx)
    except error.Abort:
        return 1

    m3 = Merge3Text(basetext, localtext, othertext)
    conflicts = False
    mode = opts.get('mode', b'merge')
    if mode == b'union':

    else:
        # localctx.flags() already has the merged flags (done in
        # mergestate.resolve())
        localctx.write(mergedtext, localctx.flags())

    if conflicts:
        return 1

48566:50de08904c63

    try:
        localtext = readctx(localctx)
        basetext = readctx(basectx)
        othertext = readctx(otherctx)
    except error.Abort:
        return True

    m3 = Merge3Text(basetext, localtext, othertext)
    conflicts = False
    mode = opts.get('mode', b'merge')
    if mode == b'union':

    else:
        # localctx.flags() already has the merged flags (done in
        # mergestate.resolve())
        localctx.write(mergedtext, localctx.flags())

    return conflicts