Mercurial > evolve
diff tests/test-evolve-content-divergent-relocation.t @ 5123:900668a93629
obslog: use _successorsetverb() in regular obslog too
It was already used for obslog --filternonlocal.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 14 Jan 2020 20:20:13 +0700 |
| parents | b6c819facbe8 |
| children | 1752a2e7a226 417503ef667d |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-relocation.t Sun Feb 02 16:18:18 2020 +0100 +++ b/tests/test-evolve-content-divergent-relocation.t Tue Jan 14 20:20:13 2020 +0700 @@ -289,16 +289,16 @@ | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | | x b4575ed6fcfc (19) added y - | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | amended(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | x | 2a9f6ccbdeba (17) added y - | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rebased(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | | x 96b677f01b81 (18) added y - |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) + |/ amended(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) | x fc6ad2bac162 (16) added y - rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) + amended(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)