Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5122:e3ab6017a40a | 5123:900668a93629 |
|---|---|
| 287 |\ | 287 |\ |
| 288 x | 48f745db3f53 (20) added y | 288 x | 48f745db3f53 (20) added y |
| 289 | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 289 | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
| 290 | | | 290 | | |
| 291 | x b4575ed6fcfc (19) added y | 291 | x b4575ed6fcfc (19) added y |
| 292 | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 292 | | amended(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
| 293 | | | 293 | | |
| 294 x | 2a9f6ccbdeba (17) added y | 294 x | 2a9f6ccbdeba (17) added y |
| 295 | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 295 | | rebased(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
| 296 | | | 296 | | |
| 297 | x 96b677f01b81 (18) added y | 297 | x 96b677f01b81 (18) added y |
| 298 |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 298 |/ amended(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 299 | | 299 | |
| 300 x fc6ad2bac162 (16) added y | 300 x fc6ad2bac162 (16) added y |
| 301 rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 301 amended(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 302 rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | 302 rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
| 303 | 303 |
| 304 | 304 |
| 305 checking that relocated commit is there | 305 checking that relocated commit is there |
| 306 $ hg exp 48f745db3f53 --hidden | 306 $ hg exp 48f745db3f53 --hidden |