Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3003:ddf28837f5af mercurial-4.0
compat-test: merge future 6.7.0 into 4.0 compat branch
(merging through 4.1 compat branch)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:18:39 +0200 |
| parents | 13c4d518327a 67b59d1657cf |
| children | 50be10c63825 |
comparison
equal
deleted
inserted
replaced
| 2810:604ddf1e1a8e | 3003:ddf28837f5af |
|---|---|
| 351 | 351 |
| 352 $ hg obslog 12 | 352 $ hg obslog 12 |
| 353 o 7b3290f6e0a0 (12) fold1 | 353 o 7b3290f6e0a0 (12) fold1 |
| 354 |\ | 354 |\ |
| 355 x | d15d0ffc75f6 (8) fold1 | 355 x | d15d0ffc75f6 (8) fold1 |
| 356 |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) | 356 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) |
| 357 | | | | 357 | | | |
| 358 | | x e036916b63ea (11) fold0 | 358 | | x e036916b63ea (11) fold0 |
| 359 | | | rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) | 359 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) |
| 360 | | | | 360 | | | |
| 361 x | | 868d2e0eb19c (4) D | 361 x | | 868d2e0eb19c (4) D |
| 362 / / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) | 362 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) |
| 363 | | | 363 | | |
| 364 x | a8df460dbbfe (3) C | 364 x | a8df460dbbfe (3) C |
| 365 / rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) | 365 / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) |
| 366 | | 366 | |
| 367 x b868bc49b0a4 (7) fold0 | 367 x b868bc49b0a4 (7) fold0 |
| 368 |\ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) | 368 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) |
| 369 | | | 369 | | |
| 370 x | 2a34000d3544 (1) A | 370 x | 2a34000d3544 (1) A |
| 371 / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) | 371 / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) |
| 372 | | 372 | |
| 373 x c473644ee0e9 (2) B | 373 x c473644ee0e9 (2) B |
| 374 rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) | 374 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob) |
| 375 | 375 |
| 376 While with all option, we should see 15 changesets | 376 While with all option, we should see 15 changesets |
| 377 | 377 |
| 378 $ hg obslog --all 15 | 378 $ hg obslog --all 15 |
| 379 o 19e14c8397fc (10) fold0 | 379 o 19e14c8397fc (10) fold0 |
| 383 | | | @ d4a000f63ee9 (15) fold2 | 383 | | | @ d4a000f63ee9 (15) fold2 |
| 384 | | | | | 384 | | | | |
| 385 | | | | o ec31316faa9d (14) fold2 | 385 | | | | o ec31316faa9d (14) fold2 |
| 386 | | | |/| | 386 | | | |/| |
| 387 | | | x | 100cc25b765f (9) fold2 | 387 | | | x | 100cc25b765f (9) fold2 |
| 388 | | | |\ \ rewritten(parent, content) by test (*) as d4a000f63ee9, ec31316faa9d (glob) | 388 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob) |
| 389 | | | | | | | 389 | | | | | | |
| 390 | +-------x d0f33db50670 (13) fold1 | 390 | +-------x d0f33db50670 (13) fold1 |
| 391 | | | | | rewritten(description, parent, content) by test (*) as ec31316faa9d (glob) | 391 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob) |
| 392 | | | | | | 392 | | | | | |
| 393 +---x | | e036916b63ea (11) fold0 | 393 +---x | | e036916b63ea (11) fold0 |
| 394 | | / / rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) | 394 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) |
| 395 | | | | | 395 | | | | |
| 396 | | x | 0da815c333f6 (5) E | 396 | | x | 0da815c333f6 (5) E |
| 397 | | / rewritten(description, content) by test (*) as 100cc25b765f (glob) | 397 | | / rewritten(description, content) as 100cc25b765f by test (*) (glob) |
| 398 | | | | 398 | | | |
| 399 x | | b868bc49b0a4 (7) fold0 | 399 x | | b868bc49b0a4 (7) fold0 |
| 400 |\ \ \ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) | 400 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) |
| 401 | | | | | 401 | | | | |
| 402 | | x | d15d0ffc75f6 (8) fold1 | 402 | | x | d15d0ffc75f6 (8) fold1 |
| 403 | | |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) | 403 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) |
| 404 | | | | | | 404 | | | | | |
| 405 | | | | x d9f908fde1a1 (6) F | 405 | | | | x d9f908fde1a1 (6) F |
| 406 | | | | rewritten(description, parent, content) by test (*) as 100cc25b765f (glob) | 406 | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob) |
| 407 | | | | | 407 | | | | |
| 408 x | | | 2a34000d3544 (1) A | 408 x | | | 2a34000d3544 (1) A |
| 409 / / / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) | 409 / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) |
| 410 | | | | 410 | | | |
| 411 | x | 868d2e0eb19c (4) D | 411 | x | 868d2e0eb19c (4) D |
| 412 | / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) | 412 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) |
| 413 | | | 413 | | |
| 414 | x a8df460dbbfe (3) C | 414 | x a8df460dbbfe (3) C |
| 415 | rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) | 415 | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) |
| 416 | | 416 | |
| 417 x c473644ee0e9 (2) B | 417 x c473644ee0e9 (2) B |
| 418 rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) | 418 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob) |
| 419 | 419 |