Mercurial > evolve
comparison tests/test-evolve-content-divergent-interrupted.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 | 1f92a6aa40d6 |
| children | 1752a2e7a226 13376ca93fa3 |
comparison
equal
deleted
inserted
replaced
| 5122:e3ab6017a40a | 5123:900668a93629 |
|---|---|
| 239 * 2ba73e31f264 (8) added c | 239 * 2ba73e31f264 (8) added c |
| 240 | | 240 | |
| 241 | @ 491e10505bae (10) added c | 241 | @ 491e10505bae (10) added c |
| 242 | | | 242 | | |
| 243 | x 7398f702a162 (9) added c | 243 | x 7398f702a162 (9) added c |
| 244 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 244 |/ amended(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 245 | | 245 | |
| 246 x ca1b80f7960a (3) added c | 246 x ca1b80f7960a (3) added c |
| 247 rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 247 amended(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 248 rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 248 amended(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 249 | 249 |
| 250 $ cd .. | 250 $ cd .. |
| 251 | 251 |
| 252 Creating content-divergence on multiple parents when gca of divergent changesets | 252 Creating content-divergence on multiple parents when gca of divergent changesets |
| 253 is parent of one of the divergents and relocating leads to conflicts | 253 is parent of one of the divergents and relocating leads to conflicts |