Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3001:67b59d1657cf mercurial-4.2
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:07:22 +0200 |
| parents | 2280461343e5 bd7e8be29542 |
| children | ddf28837f5af 9c9c8c1eeb93 |
comparison
equal
deleted
inserted
replaced
| 2808:f47ed78ab17b | 3001:67b59d1657cf |
|---|---|
| 360 | 360 |
| 361 $ hg obslog 12 | 361 $ hg obslog 12 |
| 362 o 7b3290f6e0a0 (12) fold1 | 362 o 7b3290f6e0a0 (12) fold1 |
| 363 |\ | 363 |\ |
| 364 x | d15d0ffc75f6 (8) fold1 | 364 x | d15d0ffc75f6 (8) fold1 |
| 365 |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) | 365 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) |
| 366 | | | | 366 | | | |
| 367 | | x e036916b63ea (11) fold0 | 367 | | x e036916b63ea (11) fold0 |
| 368 | | | rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) | 368 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) |
| 369 | | | | 369 | | | |
| 370 x | | 868d2e0eb19c (4) D | 370 x | | 868d2e0eb19c (4) D |
| 371 / / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) | 371 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) |
| 372 | | | 372 | | |
| 373 x | a8df460dbbfe (3) C | 373 x | a8df460dbbfe (3) C |
| 374 / rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) | 374 / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) |
| 375 | | 375 | |
| 376 x b868bc49b0a4 (7) fold0 | 376 x b868bc49b0a4 (7) fold0 |
| 377 |\ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) | 377 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) |
| 378 | | | 378 | | |
| 379 x | 2a34000d3544 (1) A | 379 x | 2a34000d3544 (1) A |
| 380 / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) | 380 / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) |
| 381 | | 381 | |
| 382 x c473644ee0e9 (2) B | 382 x c473644ee0e9 (2) B |
| 383 rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) | 383 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob) |
| 384 | 384 |
| 385 While with all option, we should see 15 changesets | 385 While with all option, we should see 15 changesets |
| 386 | 386 |
| 387 $ hg obslog --all 15 | 387 $ hg obslog --all 15 |
| 388 o 19e14c8397fc (10) fold0 | 388 o 19e14c8397fc (10) fold0 |
| 392 | | | @ d4a000f63ee9 (15) fold2 | 392 | | | @ d4a000f63ee9 (15) fold2 |
| 393 | | | | | 393 | | | | |
| 394 | | | | o ec31316faa9d (14) fold2 | 394 | | | | o ec31316faa9d (14) fold2 |
| 395 | | | |/| | 395 | | | |/| |
| 396 | | | x | 100cc25b765f (9) fold2 | 396 | | | x | 100cc25b765f (9) fold2 |
| 397 | | | |\ \ rewritten(parent, content) by test (*) as d4a000f63ee9, ec31316faa9d (glob) | 397 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob) |
| 398 | | | | | | | 398 | | | | | | |
| 399 | +-------x d0f33db50670 (13) fold1 | 399 | +-------x d0f33db50670 (13) fold1 |
| 400 | | | | | rewritten(description, parent, content) by test (*) as ec31316faa9d (glob) | 400 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob) |
| 401 | | | | | | 401 | | | | | |
| 402 +---x | | e036916b63ea (11) fold0 | 402 +---x | | e036916b63ea (11) fold0 |
| 403 | | / / rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) | 403 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) |
| 404 | | | | | 404 | | | | |
| 405 | | x | 0da815c333f6 (5) E | 405 | | x | 0da815c333f6 (5) E |
| 406 | | / rewritten(description, content) by test (*) as 100cc25b765f (glob) | 406 | | / rewritten(description, content) as 100cc25b765f by test (*) (glob) |
| 407 | | | | 407 | | | |
| 408 x | | b868bc49b0a4 (7) fold0 | 408 x | | b868bc49b0a4 (7) fold0 |
| 409 |\ \ \ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) | 409 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) |
| 410 | | | | | 410 | | | | |
| 411 | | x | d15d0ffc75f6 (8) fold1 | 411 | | x | d15d0ffc75f6 (8) fold1 |
| 412 | | |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) | 412 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) |
| 413 | | | | | | 413 | | | | | |
| 414 | | | | x d9f908fde1a1 (6) F | 414 | | | | x d9f908fde1a1 (6) F |
| 415 | | | | rewritten(description, parent, content) by test (*) as 100cc25b765f (glob) | 415 | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob) |
| 416 | | | | | 416 | | | | |
| 417 x | | | 2a34000d3544 (1) A | 417 x | | | 2a34000d3544 (1) A |
| 418 / / / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) | 418 / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) |
| 419 | | | | 419 | | | |
| 420 | x | 868d2e0eb19c (4) D | 420 | x | 868d2e0eb19c (4) D |
| 421 | / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) | 421 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) |
| 422 | | | 422 | | |
| 423 | x a8df460dbbfe (3) C | 423 | x a8df460dbbfe (3) C |
| 424 | rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) | 424 | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) |
| 425 | | 425 | |
| 426 x c473644ee0e9 (2) B | 426 x c473644ee0e9 (2) B |
| 427 rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) | 427 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob) |
| 428 | 428 |