comparison tests/test-evolve-obshistory-complex.t @ 3013:945a0989e41b

packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children e91ca8b5ecf7
comparison
equal deleted inserted replaced
3012:081070828703 3013:945a0989e41b
66 Split commits two by two 66 Split commits two by two
67 ------------------------ 67 ------------------------
68 68
69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" 69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
70 2 changesets folded 70 2 changesets folded
71 4 new unstable changesets 71 4 new orphan changesets
72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" 72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
73 2 changesets folded 73 2 changesets folded
74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" 74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2"
75 2 changesets folded 75 2 changesets folded
76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 @ changeset: 9:100cc25b765f 78 @ changeset: 9:100cc25b765f
79 | tag: tip 79 | tag: tip
80 | parent: 4:868d2e0eb19c 80 | parent: 4:868d2e0eb19c
81 | user: test 81 | user: test
82 | date: Thu Jan 01 00:00:00 1970 +0000 82 | date: Thu Jan 01 00:00:00 1970 +0000
83 | trouble: unstable 83 | instability: orphan
84 | summary: fold2 84 | summary: fold2
85 | 85 |
86 | o changeset: 8:d15d0ffc75f6 86 | o changeset: 8:d15d0ffc75f6
87 | | parent: 2:c473644ee0e9 87 | | parent: 2:c473644ee0e9
88 | | user: test 88 | | user: test
89 | | date: Thu Jan 01 00:00:00 1970 +0000 89 | | date: Thu Jan 01 00:00:00 1970 +0000
90 | | trouble: unstable 90 | | instability: orphan
91 | | summary: fold1 91 | | summary: fold1
92 | | 92 | |
93 | | o changeset: 7:b868bc49b0a4 93 | | o changeset: 7:b868bc49b0a4
94 | | | parent: 0:ea207398892e 94 | | | parent: 0:ea207398892e
95 | | | user: test 95 | | | user: test
234 $ hg log -G 234 $ hg log -G
235 @ changeset: 15:d4a000f63ee9 235 @ changeset: 15:d4a000f63ee9
236 | tag: tip 236 | tag: tip
237 | user: test 237 | user: test
238 | date: Thu Jan 01 00:00:00 1970 +0000 238 | date: Thu Jan 01 00:00:00 1970 +0000
239 | trouble: unstable 239 | instability: orphan
240 | summary: fold2 240 | summary: fold2
241 | 241 |
242 o changeset: 14:ec31316faa9d 242 o changeset: 14:ec31316faa9d
243 | parent: 4:868d2e0eb19c 243 | parent: 4:868d2e0eb19c
244 | user: test 244 | user: test
245 | date: Thu Jan 01 00:00:00 1970 +0000 245 | date: Thu Jan 01 00:00:00 1970 +0000
246 | trouble: unstable 246 | instability: orphan
247 | summary: fold2 247 | summary: fold2
248 | 248 |
249 | o changeset: 13:d0f33db50670 249 | o changeset: 13:d0f33db50670
250 | | user: test 250 | | user: test
251 | | date: Thu Jan 01 00:00:00 1970 +0000 251 | | date: Thu Jan 01 00:00:00 1970 +0000
252 | | trouble: unstable 252 | | instability: orphan
253 | | summary: fold1 253 | | summary: fold1
254 | | 254 | |
255 | o changeset: 12:7b3290f6e0a0 255 | o changeset: 12:7b3290f6e0a0
256 | | parent: 2:c473644ee0e9 256 | | parent: 2:c473644ee0e9
257 | | user: test 257 | | user: test
258 | | date: Thu Jan 01 00:00:00 1970 +0000 258 | | date: Thu Jan 01 00:00:00 1970 +0000
259 | | trouble: unstable 259 | | instability: orphan
260 | | summary: fold1 260 | | summary: fold1
261 | | 261 | |
262 | | o changeset: 11:e036916b63ea 262 | | o changeset: 11:e036916b63ea
263 | | | user: test 263 | | | user: test
264 | | | date: Thu Jan 01 00:00:00 1970 +0000 264 | | | date: Thu Jan 01 00:00:00 1970 +0000
310 $ hg log -G 310 $ hg log -G
311 @ changeset: 15:d4a000f63ee9 311 @ changeset: 15:d4a000f63ee9
312 | tag: tip 312 | tag: tip
313 | user: test 313 | user: test
314 | date: Thu Jan 01 00:00:00 1970 +0000 314 | date: Thu Jan 01 00:00:00 1970 +0000
315 | trouble: unstable 315 | instability: orphan
316 | summary: fold2 316 | summary: fold2
317 | 317 |
318 o changeset: 14:ec31316faa9d 318 o changeset: 14:ec31316faa9d
319 | parent: 4:868d2e0eb19c 319 | parent: 4:868d2e0eb19c
320 | user: test 320 | user: test
321 | date: Thu Jan 01 00:00:00 1970 +0000 321 | date: Thu Jan 01 00:00:00 1970 +0000
322 | trouble: unstable 322 | instability: orphan
323 | summary: fold2 323 | summary: fold2
324 | 324 |
325 | o changeset: 12:7b3290f6e0a0 325 | o changeset: 12:7b3290f6e0a0
326 | | parent: 2:c473644ee0e9 326 | | parent: 2:c473644ee0e9
327 | | user: test 327 | | user: test
328 | | date: Thu Jan 01 00:00:00 1970 +0000 328 | | date: Thu Jan 01 00:00:00 1970 +0000
329 | | trouble: unstable 329 | | instability: orphan
330 | | summary: fold1 330 | | summary: fold1
331 | | 331 | |
332 | | o changeset: 10:19e14c8397fc 332 | | o changeset: 10:19e14c8397fc
333 | | | parent: 0:ea207398892e 333 | | | parent: 0:ea207398892e
334 | | | user: test 334 | | | user: test
372 372
373 $ hg obslog 12 373 $ hg obslog 12
374 o 7b3290f6e0a0 (12) fold1 374 o 7b3290f6e0a0 (12) fold1
375 |\ 375 |\
376 x | d15d0ffc75f6 (8) fold1 376 x | d15d0ffc75f6 (8) fold1
377 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) 377 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
378 | | | 378 | | |
379 | | x e036916b63ea (11) fold0 379 | | x e036916b63ea (11) fold0
380 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) 380 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
381 | | | 381 | | |
382 x | | 868d2e0eb19c (4) D 382 x | | 868d2e0eb19c (4) D
383 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 383 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
384 | | 384 | |
385 x | a8df460dbbfe (3) C 385 x | a8df460dbbfe (3) C
386 / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 386 / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
387 | 387 |
388 x b868bc49b0a4 (7) fold0 388 x b868bc49b0a4 (7) fold0
389 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) 389 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
390 | | 390 | |
391 x | 2a34000d3544 (1) A 391 x | 2a34000d3544 (1) A
392 / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 392 / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
393 | 393 |
394 x c473644ee0e9 (2) B 394 x c473644ee0e9 (2) B
395 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 395 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
396 396
397 While with all option, we should see 15 changesets 397 While with all option, we should see 15 changesets
398 398
399 $ hg obslog --all 15 399 $ hg obslog --all 15
400 o 19e14c8397fc (10) fold0 400 o 19e14c8397fc (10) fold0
404 | | | @ d4a000f63ee9 (15) fold2 404 | | | @ d4a000f63ee9 (15) fold2
405 | | | | 405 | | | |
406 | | | | o ec31316faa9d (14) fold2 406 | | | | o ec31316faa9d (14) fold2
407 | | | |/| 407 | | | |/|
408 | | | x | 100cc25b765f (9) fold2 408 | | | x | 100cc25b765f (9) fold2
409 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) 409 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob)
410 | | | | | | 410 | | | | | |
411 | +-------x d0f33db50670 (13) fold1 411 | +-------x d0f33db50670 (13) fold1
412 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) 412 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob)
413 | | | | | 413 | | | | |
414 +---x | | e036916b63ea (11) fold0 414 +---x | | e036916b63ea (11) fold0
415 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) 415 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
416 | | | | 416 | | | |
417 | | x | 0da815c333f6 (5) E 417 | | x | 0da815c333f6 (5) E
418 | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 418 | | / rewritten(description, content) as 100cc25b765f by test (*) (glob)
419 | | | 419 | | |
420 x | | b868bc49b0a4 (7) fold0 420 x | | b868bc49b0a4 (7) fold0
421 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) 421 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
422 | | | | 422 | | | |
423 | | x | d15d0ffc75f6 (8) fold1 423 | | x | d15d0ffc75f6 (8) fold1
424 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) 424 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob)
425 | | | | | 425 | | | | |
426 | | | | x d9f908fde1a1 (6) F 426 | | | | x d9f908fde1a1 (6) F
427 | | | | rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) 427 | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
428 | | | | 428 | | | |
429 x | | | 2a34000d3544 (1) A 429 x | | | 2a34000d3544 (1) A
430 / / / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 430 / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
431 | | | 431 | | |
432 | x | 868d2e0eb19c (4) D 432 | x | 868d2e0eb19c (4) D
433 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 433 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob)
434 | | 434 | |
435 | x a8df460dbbfe (3) C 435 | x a8df460dbbfe (3) C
436 | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) 436 | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob)
437 | 437 |
438 x c473644ee0e9 (2) B 438 x c473644ee0e9 (2) B
439 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) 439 rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
440 440