comparison mercurial/merge.py @ 9780:1ee085511b89

subrepo: notice dirty subrepo states when merging

9779:58a6f3f4d553

    m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
    copied = set(copy.values())

    # Compare manifests
    for f, n in m1.iteritems():
        if partial and not partial(f):
            continue
        if f in m2:
            rflags = fmerge(f, f, f)
            a = ma.get(f, nullid)

9780:1ee085511b89

    m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
    copied = set(copy.values())

    # Compare manifests
    for f, n in m1.iteritems():
        if f == '.hgsubstate':
            # check whether sub state is modified
            for s in p1.substate:
                if p1.sub(s).dirty():
                    n += "+"
                    break
        if partial and not partial(f):
            continue
        if f in m2:
            rflags = fmerge(f, f, f)
            a = ma.get(f, nullid)