diff -r ebfd0d875600 -r 142827ad86f3 tests/test-evolve-content-divergent-basic.t --- a/tests/test-evolve-content-divergent-basic.t Mon Dec 09 11:09:11 2019 -0800 +++ b/tests/test-evolve-content-divergent-basic.t Thu May 07 07:57:14 2020 -0700 @@ -1002,8 +1002,8 @@ $ hg debugobsolete 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} - 084ae625fa51ca8c441ba1d2bf0f974b21671017 ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '11', 'operation': 'evolve', 'user': 'test'} - 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '11', 'operation': 'evolve', 'user': 'test'} + 084ae625fa51ca8c441ba1d2bf0f974b21671017 ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} + 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} ce0aaa423a89436c9a9b320283dc0cc89f04a91d b8e4a5a633b6fb38bbc9011601b3342573733083 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} $ hg obslog --patch @ b8e4a5a633b6 (5) E4 @@ -1022,7 +1022,7 @@ | | | | x | 084ae625fa51 (2) E2 - | | rewritten(description, meta, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | diff -r 084ae625fa51 -r ce0aaa423a89 changeset-description | | --- a/changeset-description | | +++ b/changeset-description @@ -1054,7 +1054,7 @@ | | | | | x 19ed1bf64a2c (3) E3 - |/ rewritten(description, meta, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + |/ rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | diff -r 19ed1bf64a2c -r ce0aaa423a89 changeset-description | --- a/changeset-description | +++ b/changeset-description