tests/test-evolve-obshistory-complex.t
changeset 3567 5ddea3b8d2a4
parent 3566 e6bea259c227
child 3590 d5adce52cef4
child 4291 8f54ab5dd4e2
equal deleted inserted replaced
3566:e6bea259c227 3567:5ddea3b8d2a4
   284   | | |  summary:     fold0
   284   | | |  summary:     fold0
   285   | | |
   285   | | |
   286   x | |  changeset:   4:868d2e0eb19c
   286   x | |  changeset:   4:868d2e0eb19c
   287   | | |  user:        test
   287   | | |  user:        test
   288   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   288   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   289   | | |  obsolete:    split using fold as 12:7b3290f6e0a0, 13:d0f33db50670
   289   | | |  obsolete:    split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
   290   | | |  summary:     D
   290   | | |  summary:     D
   291   | | |
   291   | | |
   292   x | |  changeset:   3:a8df460dbbfe
   292   x | |  changeset:   3:a8df460dbbfe
   293   |/ /   user:        test
   293   |/ /   user:        test
   294   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   294   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   295   | |    obsolete:    split using fold as 12:7b3290f6e0a0, 13:d0f33db50670
   295   | |    obsolete:    split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
   296   | |    summary:     C
   296   | |    summary:     C
   297   | |
   297   | |
   298   x |  changeset:   2:c473644ee0e9
   298   x |  changeset:   2:c473644ee0e9
   299   | |  user:        test
   299   | |  user:        test
   300   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   300   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   301   | |  obsolete:    split using fold as 10:19e14c8397fc, 11:e036916b63ea
   301   | |  obsolete:    split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
   302   | |  summary:     B
   302   | |  summary:     B
   303   | |
   303   | |
   304   x |  changeset:   1:2a34000d3544
   304   x |  changeset:   1:2a34000d3544
   305   |/   user:        test
   305   |/   user:        test
   306   |    date:        Thu Jan 01 00:00:00 1970 +0000
   306   |    date:        Thu Jan 01 00:00:00 1970 +0000
   307   |    obsolete:    split using fold as 10:19e14c8397fc, 11:e036916b63ea
   307   |    obsolete:    split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
   308   |    summary:     A
   308   |    summary:     A
   309   |
   309   |
   310   o  changeset:   0:ea207398892e
   310   o  changeset:   0:ea207398892e
   311      user:        test
   311      user:        test
   312      date:        Thu Jan 01 00:00:00 1970 +0000
   312      date:        Thu Jan 01 00:00:00 1970 +0000
   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, prune as 12:7b3290f6e0a0, 14:ec31316faa9d
   354   | | |  obsolete:    split using fold, prune, split 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, prune as 12:7b3290f6e0a0, 14:ec31316faa9d
   360   | |    obsolete:    split using fold, prune, split 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, prune as 10:19e14c8397fc, 12:7b3290f6e0a0
   366   | |  obsolete:    split using fold, prune, split 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, prune as 10:19e14c8397fc, 12:7b3290f6e0a0
   372   |    obsolete:    split using fold, prune, split 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
   385 
   385 
   386   $ hg obslog 12
   386   $ hg obslog 12
   387   *    7b3290f6e0a0 (12) fold1
   387   *    7b3290f6e0a0 (12) fold1
   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 using split 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 using prune 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
   397   | |
   397   | |
   398   x |  a8df460dbbfe (3) C
   398   x |  a8df460dbbfe (3) C
   399    /     rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   399    /     rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   400   |
   400   |
   401   x    b868bc49b0a4 (7) fold0
   401   x    b868bc49b0a4 (7) fold0
   402   |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   402   |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   403   | |
   403   | |
   404   x |  2a34000d3544 (1) A
   404   x |  2a34000d3544 (1) A
   405    /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   405    /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   406   |
   406   |
   407   x  c473644ee0e9 (2) B
   407   x  c473644ee0e9 (2) B
   417   | | | @  d4a000f63ee9 (15) fold2
   417   | | | @  d4a000f63ee9 (15) fold2
   418   | | | |
   418   | | | |
   419   | | | | *  ec31316faa9d (14) fold2
   419   | | | | *  ec31316faa9d (14) fold2
   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 using split 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 using prune 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   | | | | |
   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   | | |
   435   x | |    b868bc49b0a4 (7) fold0
   435   x | |    b868bc49b0a4 (7) fold0
   436   |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   436   |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   437   | | | |
   437   | | | |
   438   | | x |    d15d0ffc75f6 (8) fold1
   438   | | x |    d15d0ffc75f6 (8) fold1
   439   | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
   439   | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   440   | | | | |
   440   | | | | |
   441   | | | | x  d9f908fde1a1 (6) F
   441   | | | | x  d9f908fde1a1 (6) F
   442   | | | |      rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   442   | | | |      rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   443   | | | |        note: folding changesets to test
   443   | | | |        note: folding changesets to test
   444   | | | |
   444   | | | |