tests/test-evolve-obshistory-complex.t
changeset 5123 900668a93629
parent 5115 f44cc9abf21c
child 5159 e5fe3ca5e6ad
child 5338 7e93d9db1d1a
equal deleted inserted replaced
5122:e3ab6017a40a 5123:900668a93629
    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
    77   $ hg obslog -r .
    77   $ hg obslog -r .
    78   @    100cc25b765f (9) fold2
    78   @    100cc25b765f (9) fold2
    79   |\
    79   |\
    80   x |  0da815c333f6 (5) E
    80   x |  0da815c333f6 (5) E
    81    /     rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    81    /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    82   |        note: folding changesets to test
    82   |        note: folding changesets to test
    83   |
    83   |
    84   x  d9f908fde1a1 (6) F
    84   x  d9f908fde1a1 (6) F
    85        rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    85        folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    86          note: folding changesets to test
    86          note: folding changesets to test
    87   
    87   
    88   $ hg log -G 
    88   $ hg log -G 
    89   @  changeset:   9:100cc25b765f
    89   @  changeset:   9:100cc25b765f
    90   |  tag:         tip
    90   |  tag:         tip
   400 
   400 
   401   $ hg obslog 12
   401   $ hg obslog 12
   402   *    7b3290f6e0a0 (12) fold1
   402   *    7b3290f6e0a0 (12) fold1
   403   |\
   403   |\
   404   x |    d15d0ffc75f6 (8) fold1
   404   x |    d15d0ffc75f6 (8) fold1
   405   |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   405   |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   406   | | |
   406   | | |
   407   | | x  e036916b63ea (11) fold0
   407   | | x  e036916b63ea (11) fold0
   408   | | |    rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   408   | | |    rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   409   | | |
   409   | | |
   410   x | |  868d2e0eb19c (4) D
   410   x | |  868d2e0eb19c (4) D
   411    / /     rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   411    / /     folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   412   | |
   412   | |
   413   x |  a8df460dbbfe (3) C
   413   x |  a8df460dbbfe (3) C
   414    /     rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   414    /     folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   415   |
   415   |
   416   x    b868bc49b0a4 (7) fold0
   416   x    b868bc49b0a4 (7) fold0
   417   |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   417   |\     split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   418   | |
   418   | |
   419   x |  2a34000d3544 (1) A
   419   x |  2a34000d3544 (1) A
   420    /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   420    /     folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   421   |
   421   |
   422   x  c473644ee0e9 (2) B
   422   x  c473644ee0e9 (2) B
   423        rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   423        folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   424   
   424   
   425 While with all option, we should see 15 changesets
   425 While with all option, we should see 15 changesets
   426 
   426 
   427   $ hg obslog --all 15
   427   $ hg obslog --all 15
   428   o  19e14c8397fc (10) fold0
   428   o  19e14c8397fc (10) fold0
   432   | | | @  d4a000f63ee9 (15) fold2
   432   | | | @  d4a000f63ee9 (15) fold2
   433   | | | |
   433   | | | |
   434   | | | | *  ec31316faa9d (14) fold2
   434   | | | | *  ec31316faa9d (14) fold2
   435   | | | |/|
   435   | | | |/|
   436   | | | x |    100cc25b765f (9) fold2
   436   | | | x |    100cc25b765f (9) fold2
   437   | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
   437   | | | |\ \     split(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
   438   | | | | | |
   438   | | | | | |
   439   | +-------x  d0f33db50670 (13) fold1
   439   | +-------x  d0f33db50670 (13) fold1
   440   | | | | |      rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   440   | | | | |      rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   441   | | | | |        note: this is a note stored in obsmarker in prune
   441   | | | | |        note: this is a note stored in obsmarker in prune
   442   | | | | |
   442   | | | | |
   443   +---x | |  e036916b63ea (11) fold0
   443   +---x | |  e036916b63ea (11) fold0
   444   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   444   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   445   | | | |
   445   | | | |
   446   | | x |  0da815c333f6 (5) E
   446   | | x |  0da815c333f6 (5) E
   447   | |  /     rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   447   | |  /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   448   | | |        note: folding changesets to test
   448   | | |        note: folding changesets to test
   449   | | |
   449   | | |
   450   x | |    b868bc49b0a4 (7) fold0
   450   x | |    b868bc49b0a4 (7) fold0
   451   |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   451   |\ \ \     split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
   452   | | | |
   452   | | | |
   453   | | x |    d15d0ffc75f6 (8) fold1
   453   | | x |    d15d0ffc75f6 (8) fold1
   454   | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   454   | | |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   455   | | | | |
   455   | | | | |
   456   | | | | x  d9f908fde1a1 (6) F
   456   | | | | x  d9f908fde1a1 (6) F
   457   | | | |      rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   457   | | | |      folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   458   | | | |        note: folding changesets to test
   458   | | | |        note: folding changesets to test
   459   | | | |
   459   | | | |
   460   x | | |  2a34000d3544 (1) A
   460   x | | |  2a34000d3544 (1) A
   461    / / /     rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   461    / / /     folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   462   | | |
   462   | | |
   463   | x |  868d2e0eb19c (4) D
   463   | x |  868d2e0eb19c (4) D
   464   |  /     rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   464   |  /     folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   465   | |
   465   | |
   466   | x  a8df460dbbfe (3) C
   466   | x  a8df460dbbfe (3) C
   467   |      rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   467   |      folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   468   |
   468   |
   469   x  c473644ee0e9 (2) B
   469   x  c473644ee0e9 (2) B
   470        rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   470        folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   471   
   471