equal
deleted
inserted
replaced
755 """ |
755 """ |
756 for path, data in pycompat.iteritems(filedata): |
756 for path, data in pycompat.iteritems(filedata): |
757 fctx = ctx[path] |
757 fctx = ctx[path] |
758 fctx.write(data, fctx.flags()) |
758 fctx.write(data, fctx.flags()) |
759 if repo.dirstate[path] == b'n': |
759 if repo.dirstate[path] == b'n': |
760 repo.dirstate.normallookup(path) |
760 repo.dirstate.set_possibly_dirty(path) |
761 |
761 |
762 oldparentnodes = repo.dirstate.parents() |
762 oldparentnodes = repo.dirstate.parents() |
763 newparentnodes = [replacements.get(n, n) for n in oldparentnodes] |
763 newparentnodes = [replacements.get(n, n) for n in oldparentnodes] |
764 if newparentnodes != oldparentnodes: |
764 if newparentnodes != oldparentnodes: |
765 repo.setparents(*newparentnodes) |
765 repo.setparents(*newparentnodes) |