Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3566:e6bea259c227
prune: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:51:17 -0700 |
| parents | 589649021ea1 |
| children | 5ddea3b8d2a4 |
comparison
equal
deleted
inserted
replaced
| 3565:cfe31185ad07 | 3566:e6bea259c227 |
|---|---|
| 349 | | | summary: fold0 | 349 | | | summary: fold0 |
| 350 | | | | 350 | | | |
| 351 x | | changeset: 4:868d2e0eb19c | 351 x | | changeset: 4:868d2e0eb19c |
| 352 | | | user: test | 352 | | | user: test |
| 353 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 353 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 354 | | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d | 354 | | | obsolete: split using fold, prune as 12:7b3290f6e0a0, 14:ec31316faa9d |
| 355 | | | summary: D | 355 | | | summary: D |
| 356 | | | | 356 | | | |
| 357 x | | changeset: 3:a8df460dbbfe | 357 x | | changeset: 3:a8df460dbbfe |
| 358 |/ / user: test | 358 |/ / user: test |
| 359 | | date: Thu Jan 01 00:00:00 1970 +0000 | 359 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 360 | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d | 360 | | obsolete: split using fold, prune as 12:7b3290f6e0a0, 14:ec31316faa9d |
| 361 | | summary: C | 361 | | summary: C |
| 362 | | | 362 | | |
| 363 x | changeset: 2:c473644ee0e9 | 363 x | changeset: 2:c473644ee0e9 |
| 364 | | user: test | 364 | | user: test |
| 365 | | date: Thu Jan 01 00:00:00 1970 +0000 | 365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 366 | | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 | 366 | | obsolete: split using fold, prune as 10:19e14c8397fc, 12:7b3290f6e0a0 |
| 367 | | summary: B | 367 | | summary: B |
| 368 | | | 368 | | |
| 369 x | changeset: 1:2a34000d3544 | 369 x | changeset: 1:2a34000d3544 |
| 370 |/ user: test | 370 |/ user: test |
| 371 | date: Thu Jan 01 00:00:00 1970 +0000 | 371 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 372 | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 | 372 | obsolete: split using fold, prune as 10:19e14c8397fc, 12:7b3290f6e0a0 |
| 373 | summary: A | 373 | summary: A |
| 374 | | 374 | |
| 375 o changeset: 0:ea207398892e | 375 o changeset: 0:ea207398892e |
| 376 user: test | 376 user: test |
| 377 date: Thu Jan 01 00:00:00 1970 +0000 | 377 date: Thu Jan 01 00:00:00 1970 +0000 |
| 388 |\ | 388 |\ |
| 389 x | d15d0ffc75f6 (8) fold1 | 389 x | d15d0ffc75f6 (8) fold1 |
| 390 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) | 390 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 391 | | | | 391 | | | |
| 392 | | x e036916b63ea (11) fold0 | 392 | | x e036916b63ea (11) fold0 |
| 393 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) | 393 | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
| 394 | | | | 394 | | | |
| 395 x | | 868d2e0eb19c (4) D | 395 x | | 868d2e0eb19c (4) D |
| 396 / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 396 / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 397 | | | 397 | | |
| 398 x | a8df460dbbfe (3) C | 398 x | a8df460dbbfe (3) C |
| 420 | | | |/| | 420 | | | |/| |
| 421 | | | x | 100cc25b765f (9) fold2 | 421 | | | x | 100cc25b765f (9) fold2 |
| 422 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) | 422 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) |
| 423 | | | | | | | 423 | | | | | | |
| 424 | +-------x d0f33db50670 (13) fold1 | 424 | +-------x d0f33db50670 (13) fold1 |
| 425 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) | 425 | | | | | rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
| 426 | | | | | note: this is a note stored in obsmarker in prune | 426 | | | | | note: this is a note stored in obsmarker in prune |
| 427 | | | | | | 427 | | | | | |
| 428 +---x | | e036916b63ea (11) fold0 | 428 +---x | | e036916b63ea (11) fold0 |
| 429 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) | 429 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
| 430 | | | | | 430 | | | | |
| 431 | | x | 0da815c333f6 (5) E | 431 | | x | 0da815c333f6 (5) E |
| 432 | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 432 | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 433 | | | note: folding changesets to test | 433 | | | note: folding changesets to test |
| 434 | | | | 434 | | | |