Submitter | Pulkit Goyal |
---|---|
Date | Sept. 11, 2020, 7:05 a.m. |
Message ID | <8abe98dc3e3c020566d6.1599807932@workspace> |
Download | mbox | patch |
Permalink | /patch/47134/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -2062,7 +2062,7 @@ def debugmergestate(ui, repo, *args, **o fm_files.data(renamed_path=state[1]) fm_files.data(rename_side=state[2]) fm_extras = fm_files.nested(b'extras') - for k, v in ms.extras(f).items(): + for k, v in sorted(ms.extras(f).items()): fm_extras.startitem() fm_extras.data(key=k) fm_extras.data(value=v)