equal
deleted
inserted
replaced
2060 mergestatemod.MERGE_RECORD_RESOLVED_PATH, |
2060 mergestatemod.MERGE_RECORD_RESOLVED_PATH, |
2061 ): |
2061 ): |
2062 fm_files.data(renamed_path=state[1]) |
2062 fm_files.data(renamed_path=state[1]) |
2063 fm_files.data(rename_side=state[2]) |
2063 fm_files.data(rename_side=state[2]) |
2064 fm_extras = fm_files.nested(b'extras') |
2064 fm_extras = fm_files.nested(b'extras') |
2065 for k, v in ms.extras(f).items(): |
2065 for k, v in sorted(ms.extras(f).items()): |
2066 fm_extras.startitem() |
2066 fm_extras.startitem() |
2067 fm_extras.data(key=k) |
2067 fm_extras.data(key=k) |
2068 fm_extras.data(value=v) |
2068 fm_extras.data(value=v) |
2069 fm_extras.end() |
2069 fm_extras.end() |
2070 |
2070 |