Mercurial > evolve

comparison tests/test-evolve-obshistory-complex.t @ 3592:7a5c3175015e mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2 1e2f683e11e7
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 $ hg obslog -r . 78 $ hg obslog -r .
79 @ 100cc25b765f (9) fold2 79 @ 100cc25b765f (9) fold2
80 |\ 80 |\
81 x | 0da815c333f6 (5) E 81 x | 0da815c333f6 (5) E
82 / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 82 / rewritten(description, content) as 100cc25b765f by test (*) (glob)
83 | note: folding changesets to test 83 | note: folding changesets to test
84 | 84 |
85 x d9f908fde1a1 (6) F 85 x d9f908fde1a1 (6) F
86 rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 86 rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
87 note: folding changesets to test 87 note: folding changesets to test
88 88
89 $ hg log -G 89 $ hg log -G
90 @ changeset: 9:100cc25b765f 90 @ changeset: 9:100cc25b765f
91 | tag: tip 91 | tag: tip
109 | | | summary: fold0 109 | | | summary: fold0
110 | | | 110 | | |
111 x | | changeset: 4:868d2e0eb19c 111 x | | changeset: 4:868d2e0eb19c
112 | | | user: test 112 | | | user: test
113 | | | date: Thu Jan 01 00:00:00 1970 +0000 113 | | | date: Thu Jan 01 00:00:00 1970 +0000
114 | | | obsolete: rewritten as d15d0ffc75f6
115 | | | summary: D 114 | | | summary: D
116 | | | 115 | | |
117 x | | changeset: 3:a8df460dbbfe 116 x | | changeset: 3:a8df460dbbfe
118 |/ / user: test 117 |/ / user: test
119 | | date: Thu Jan 01 00:00:00 1970 +0000 118 | | date: Thu Jan 01 00:00:00 1970 +0000
120 | | obsolete: rewritten as d15d0ffc75f6
121 | | summary: C 119 | | summary: C
122 | | 120 | |
123 x | changeset: 2:c473644ee0e9 121 x | changeset: 2:c473644ee0e9
124 | | user: test 122 | | user: test
125 | | date: Thu Jan 01 00:00:00 1970 +0000 123 | | date: Thu Jan 01 00:00:00 1970 +0000
126 | | obsolete: rewritten as b868bc49b0a4
127 | | summary: B 124 | | summary: B
128 | | 125 | |
129 x | changeset: 1:2a34000d3544 126 x | changeset: 1:2a34000d3544
130 |/ user: test 127 |/ user: test
131 | date: Thu Jan 01 00:00:00 1970 +0000 128 | date: Thu Jan 01 00:00:00 1970 +0000
132 | obsolete: rewritten as b868bc49b0a4
133 | summary: A 129 | summary: A
134 | 130 |
135 o changeset: 0:ea207398892e 131 o changeset: 0:ea207398892e
136 user: test 132 user: test
137 date: Thu Jan 01 00:00:00 1970 +0000 133 date: Thu Jan 01 00:00:00 1970 +0000
283 | | | summary: fold0 279 | | | summary: fold0
284 | | | 280 | | |
285 x | | changeset: 4:868d2e0eb19c 281 x | | changeset: 4:868d2e0eb19c
286 | | | user: test 282 | | | user: test
287 | | | date: Thu Jan 01 00:00:00 1970 +0000 283 | | | date: Thu Jan 01 00:00:00 1970 +0000
288 | | | obsolete: split as 7b3290f6e0a0, d0f33db50670
289 | | | summary: D 284 | | | summary: D
290 | | | 285 | | |
291 x | | changeset: 3:a8df460dbbfe 286 x | | changeset: 3:a8df460dbbfe
292 |/ / user: test 287 |/ / user: test
293 | | date: Thu Jan 01 00:00:00 1970 +0000 288 | | date: Thu Jan 01 00:00:00 1970 +0000
294 | | obsolete: split as 7b3290f6e0a0, d0f33db50670
295 | | summary: C 289 | | summary: C
296 | | 290 | |
297 x | changeset: 2:c473644ee0e9 291 x | changeset: 2:c473644ee0e9
298 | | user: test 292 | | user: test
299 | | date: Thu Jan 01 00:00:00 1970 +0000 293 | | date: Thu Jan 01 00:00:00 1970 +0000
300 | | obsolete: split as 19e14c8397fc, e036916b63ea
301 | | summary: B 294 | | summary: B
302 | | 295 | |
303 x | changeset: 1:2a34000d3544 296 x | changeset: 1:2a34000d3544
304 |/ user: test 297 |/ user: test
305 | date: Thu Jan 01 00:00:00 1970 +0000 298 | date: Thu Jan 01 00:00:00 1970 +0000
306 | obsolete: split as 19e14c8397fc, e036916b63ea
307 | summary: A 299 | summary: A
308 | 300 |
309 o changeset: 0:ea207398892e 301 o changeset: 0:ea207398892e
310 user: test 302 user: test
311 date: Thu Jan 01 00:00:00 1970 +0000 303 date: Thu Jan 01 00:00:00 1970 +0000
349 | | | summary: fold0 341 | | | summary: fold0
350 | | | 342 | | |
351 x | | changeset: 4:868d2e0eb19c 343 x | | changeset: 4:868d2e0eb19c
352 | | | user: test 344 | | | user: test
353 | | | date: Thu Jan 01 00:00:00 1970 +0000 345 | | | date: Thu Jan 01 00:00:00 1970 +0000
354 | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
355 | | | summary: D 346 | | | summary: D
356 | | | 347 | | |
357 x | | changeset: 3:a8df460dbbfe 348 x | | changeset: 3:a8df460dbbfe
358 |/ / user: test 349 |/ / user: test
359 | | date: Thu Jan 01 00:00:00 1970 +0000 350 | | date: Thu Jan 01 00:00:00 1970 +0000
360 | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
361 | | summary: C 351 | | summary: C
362 | | 352 | |
363 x | changeset: 2:c473644ee0e9 353 x | changeset: 2:c473644ee0e9
364 | | user: test 354 | | user: test
365 | | date: Thu Jan 01 00:00:00 1970 +0000 355 | | date: Thu Jan 01 00:00:00 1970 +0000
366 | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
367 | | summary: B 356 | | summary: B
368 | | 357 | |
369 x | changeset: 1:2a34000d3544 358 x | changeset: 1:2a34000d3544
370 |/ user: test 359 |/ user: test
371 | date: Thu Jan 01 00:00:00 1970 +0000 360 | date: Thu Jan 01 00:00:00 1970 +0000
372 | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
373 | summary: A 361 | summary: A
374 | 362 |
375 o changeset: 0:ea207398892e 363 o changeset: 0:ea207398892e
376 user: test 364 user: test
377 date: Thu Jan 01 00:00:00 1970 +0000 365 date: Thu Jan 01 00:00:00 1970 +0000
385 373
386 $ hg obslog 12 374 $ hg obslog 12
387 o 7b3290f6e0a0 (12) fold1 375 o 7b3290f6e0a0 (12) fold1
388 |\ 376 |\
389 x | d15d0ffc75f6 (8) fold1 377 x | d15d0ffc75f6 (8) fold1
390 |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) 378 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
391 | | | 379 | | |
392 | | x e036916b63ea (11) fold0 380 | | x e036916b63ea (11) fold0
393 | | | rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) 381 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
394 | | | 382 | | |
395 x | | 868d2e0eb19c (4) D 383 x | | 868d2e0eb19c (4) D
396 / / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 384 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
397 | | 385 | |
398 x | a8df460dbbfe (3) C 386 x | a8df460dbbfe (3) C
399 / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 387 / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
400 | 388 |
401 x b868bc49b0a4 (7) fold0 389 x b868bc49b0a4 (7) fold0
402 |\ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) 390 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
403 | | 391 | |
404 x | 2a34000d3544 (1) A 392 x | 2a34000d3544 (1) A
405 / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 393 / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
406 | 394 |
407 x c473644ee0e9 (2) B 395 x c473644ee0e9 (2) B
408 rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 396 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
409 397
410 While with all option, we should see 15 changesets 398 While with all option, we should see 15 changesets
411 399
412 $ hg obslog --all 15 400 $ hg obslog --all 15
413 o 19e14c8397fc (10) fold0 401 o 19e14c8397fc (10) fold0
417 | | | @ d4a000f63ee9 (15) fold2 405 | | | @ d4a000f63ee9 (15) fold2
418 | | | | 406 | | | |
419 | | | | o ec31316faa9d (14) fold2 407 | | | | o ec31316faa9d (14) fold2
420 | | | |/| 408 | | | |/|
421 | | | x | 100cc25b765f (9) fold2 409 | | | x | 100cc25b765f (9) fold2
422 | | | |\ \ rewritten as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) 410 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob)
423 | | | | | | 411 | | | | | |
424 | +-------x d0f33db50670 (13) fold1 412 | +-------x d0f33db50670 (13) fold1
425 | | | | | rewritten as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) 413 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob)
426 | | | | | note: this is a note stored in obsmarker in prune 414 | | | | | note: this is a note stored in obsmarker in prune
427 | | | | | 415 | | | | |
428 +---x | | e036916b63ea (11) fold0 416 +---x | | e036916b63ea (11) fold0
429 | | / / rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) 417 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
430 | | | | 418 | | | |
431 | | x | 0da815c333f6 (5) E 419 | | x | 0da815c333f6 (5) E
432 | | / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 420 | | / rewritten(description, content) as 100cc25b765f by test (*) (glob)
433 | | | note: folding changesets to test 421 | | | note: folding changesets to test
434 | | | 422 | | |
435 x | | b868bc49b0a4 (7) fold0 423 x | | b868bc49b0a4 (7) fold0
436 |\ \ \ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) 424 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
437 | | | | 425 | | | |
438 | | x | d15d0ffc75f6 (8) fold1 426 | | x | d15d0ffc75f6 (8) fold1
439 | | |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) 427 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
440 | | | | | 428 | | | | |
441 | | | | x d9f908fde1a1 (6) F 429 | | | | x d9f908fde1a1 (6) F
442 | | | | rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 430 | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
443 | | | | note: folding changesets to test 431 | | | | note: folding changesets to test
444 | | | | 432 | | | |
445 x | | | 2a34000d3544 (1) A 433 x | | | 2a34000d3544 (1) A
446 / / / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 434 / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
447 | | | 435 | | |
448 | x | 868d2e0eb19c (4) D 436 | x | 868d2e0eb19c (4) D
449 | / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 437 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
450 | | 438 | |
451 | x a8df460dbbfe (3) C 439 | x a8df460dbbfe (3) C
452 | rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 440 | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
453 | 441 |
454 x c473644ee0e9 (2) B 442 x c473644ee0e9 (2) B
455 rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 443 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
456 444