tests/test-evolve-obshistory-complex.t
branchmercurial-4.3
changeset 3716 e5ba6531503e
parent 3591 98941c28f3e2
equal deleted inserted replaced
3715:a77fb9669e99 3716:e5ba6531503e
    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 (Thu Jan 01 00:00:00 1970 +0000)
    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 (Thu Jan 01 00:00:00 1970 +0000)
    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
   385 
   385 
   386   $ hg obslog 12
   386   $ hg obslog 12
   387   o    7b3290f6e0a0 (12) fold1
   387   o    7b3290f6e0a0 (12) fold1
   388   |\
   388   |\
   389   x |    d15d0ffc75f6 (8) fold1
   389   x |    d15d0ffc75f6 (8) fold1
   390   |\ \     rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
   390   |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
   391   | | |
   391   | | |
   392   | | x  e036916b63ea (11) fold0
   392   | | x  e036916b63ea (11) fold0
   393   | | |    rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
   393   | | |    rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
   394   | | |
   394   | | |
   395   x | |  868d2e0eb19c (4) D
   395   x | |  868d2e0eb19c (4) D
   396    / /     rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   396    / /     rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   397   | |
   397   | |
   398   x |  a8df460dbbfe (3) C
   398   x |  a8df460dbbfe (3) C
   399    /     rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   399    /     rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   400   |
   400   |
   401   x    b868bc49b0a4 (7) fold0
   401   x    b868bc49b0a4 (7) fold0
   402   |\     rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   402   |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   403   | |
   403   | |
   404   x |  2a34000d3544 (1) A
   404   x |  2a34000d3544 (1) A
   405    /     rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   405    /     rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   406   |
   406   |
   407   x  c473644ee0e9 (2) B
   407   x  c473644ee0e9 (2) B
   408        rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   408        rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   409   
   409   
   410 While with all option, we should see 15 changesets
   410 While with all option, we should see 15 changesets
   411 
   411 
   412   $ hg obslog --all 15
   412   $ hg obslog --all 15
   413   o  19e14c8397fc (10) fold0
   413   o  19e14c8397fc (10) fold0
   417   | | | @  d4a000f63ee9 (15) fold2
   417   | | | @  d4a000f63ee9 (15) fold2
   418   | | | |
   418   | | | |
   419   | | | | o  ec31316faa9d (14) fold2
   419   | | | | o  ec31316faa9d (14) fold2
   420   | | | |/|
   420   | | | |/|
   421   | | | x |    100cc25b765f (9) fold2
   421   | | | x |    100cc25b765f (9) fold2
   422   | | | |\ \     rewritten as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
   422   | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
   423   | | | | | |
   423   | | | | | |
   424   | +-------x  d0f33db50670 (13) fold1
   424   | +-------x  d0f33db50670 (13) fold1
   425   | | | | |      rewritten as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
   425   | | | | |      rewritten(description, parent, content) as ec31316faa9d 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   | | | | |
   428   +---x | |  e036916b63ea (11) fold0
   428   +---x | |  e036916b63ea (11) fold0
   429   | |  / /     rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
   429   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
   430   | | | |
   430   | | | |
   431   | | x |  0da815c333f6 (5) E
   431   | | x |  0da815c333f6 (5) E
   432   | |  /     rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
   432   | |  /     rewritten(description, content) as 100cc25b765f 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 as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   436   |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
   437   | | | |
   437   | | | |
   438   | | x |    d15d0ffc75f6 (8) fold1
   438   | | x |    d15d0ffc75f6 (8) fold1
   439   | | |\ \     rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
   439   | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
   440   | | | | |
   440   | | | | |
   441   | | | | x  d9f908fde1a1 (6) F
   441   | | | | x  d9f908fde1a1 (6) F
   442   | | | |      rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
   442   | | | |      rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
   443   | | | |        note: folding changesets to test
   443   | | | |        note: folding changesets to test
   444   | | | |
   444   | | | |
   445   x | | |  2a34000d3544 (1) A
   445   x | | |  2a34000d3544 (1) A
   446    / / /     rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   446    / / /     rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   447   | | |
   447   | | |
   448   | x |  868d2e0eb19c (4) D
   448   | x |  868d2e0eb19c (4) D
   449   |  /     rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   449   |  /     rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   450   | |
   450   | |
   451   | x  a8df460dbbfe (3) C
   451   | x  a8df460dbbfe (3) C
   452   |      rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   452   |      rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   453   |
   453   |
   454   x  c473644ee0e9 (2) B
   454   x  c473644ee0e9 (2) B
   455        rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   455        rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
   456   
   456