tests/test-evolve-obshistory.t
changeset 3223 73b4e84df0bd
parent 3216 13cb0810ce22
child 3287 4303a46b4167
child 3359 ae6fddf39933
child 3363 380fa6e8baf2
equal deleted inserted replaced
3222:adbae782aac7 3223:73b4e84df0bd
   372 
   372 
   373 Check that debugobshistory on splitted commit show both targets
   373 Check that debugobshistory on splitted commit show both targets
   374   $ hg obslog 471597cad322 --hidden --patch
   374   $ hg obslog 471597cad322 --hidden --patch
   375   x  471597cad322 (1) A0
   375   x  471597cad322 (1) A0
   376        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   376        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   377          note: 'testing split'
   377          note: testing split
   378          (No patch available, too many successors (2))
   378          (No patch available, too many successors (2))
   379   
   379   
   380   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
   380   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
   381   [
   381   [
   382       {
   382       {
   409   $ hg obslog 337fec4d2edc --patch
   409   $ hg obslog 337fec4d2edc --patch
   410   o  337fec4d2edc (2) A0
   410   o  337fec4d2edc (2) A0
   411   |
   411   |
   412   x  471597cad322 (1) A0
   412   x  471597cad322 (1) A0
   413        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   413        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   414          note: 'testing split'
   414          note: testing split
   415          (No patch available, too many successors (2))
   415          (No patch available, too many successors (2))
   416   
   416   
   417 With the all option, it should show the three changesets
   417 With the all option, it should show the three changesets
   418   $ hg obslog --all 337fec4d2edc --patch
   418   $ hg obslog --all 337fec4d2edc --patch
   419   o  337fec4d2edc (2) A0
   419   o  337fec4d2edc (2) A0
   420   |
   420   |
   421   | @  f257fde29c7a (3) A0
   421   | @  f257fde29c7a (3) A0
   422   |/
   422   |/
   423   x  471597cad322 (1) A0
   423   x  471597cad322 (1) A0
   424        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   424        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   425          note: 'testing split'
   425          note: testing split
   426          (No patch available, too many successors (2))
   426          (No patch available, too many successors (2))
   427   
   427   
   428 Check that debugobshistory on the second successor after split show
   428 Check that debugobshistory on the second successor after split show
   429 the revision plus the splitted one
   429 the revision plus the splitted one
   430   $ hg obslog f257fde29c7a --patch
   430   $ hg obslog f257fde29c7a --patch
   431   @  f257fde29c7a (3) A0
   431   @  f257fde29c7a (3) A0
   432   |
   432   |
   433   x  471597cad322 (1) A0
   433   x  471597cad322 (1) A0
   434        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   434        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   435          note: 'testing split'
   435          note: testing split
   436          (No patch available, too many successors (2))
   436          (No patch available, too many successors (2))
   437   
   437   
   438 With the all option, it should show the three changesets
   438 With the all option, it should show the three changesets
   439   $ hg obslog f257fde29c7a --all --patch
   439   $ hg obslog f257fde29c7a --all --patch
   440   o  337fec4d2edc (2) A0
   440   o  337fec4d2edc (2) A0
   441   |
   441   |
   442   | @  f257fde29c7a (3) A0
   442   | @  f257fde29c7a (3) A0
   443   |/
   443   |/
   444   x  471597cad322 (1) A0
   444   x  471597cad322 (1) A0
   445        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   445        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   446          note: 'testing split'
   446          note: testing split
   447          (No patch available, too many successors (2))
   447          (No patch available, too many successors (2))
   448   
   448   
   449 Obslog with all option all should also works on the splitted commit
   449 Obslog with all option all should also works on the splitted commit
   450   $ hg obslog -a 471597cad322 --hidden --patch
   450   $ hg obslog -a 471597cad322 --hidden --patch
   451   o  337fec4d2edc (2) A0
   451   o  337fec4d2edc (2) A0
   452   |
   452   |
   453   | @  f257fde29c7a (3) A0
   453   | @  f257fde29c7a (3) A0
   454   |/
   454   |/
   455   x  471597cad322 (1) A0
   455   x  471597cad322 (1) A0
   456        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   456        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   457          note: 'testing split'
   457          note: testing split
   458          (No patch available, too many successors (2))
   458          (No patch available, too many successors (2))
   459   
   459   
   460 Check that debugobshistory on both successors after split show
   460 Check that debugobshistory on both successors after split show
   461 a coherent graph
   461 a coherent graph
   462   $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
   462   $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
   464   |
   464   |
   465   | @  f257fde29c7a (3) A0
   465   | @  f257fde29c7a (3) A0
   466   |/
   466   |/
   467   x  471597cad322 (1) A0
   467   x  471597cad322 (1) A0
   468        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   468        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
   469          note: 'testing split'
   469          note: testing split
   470          (No patch available, too many successors (2))
   470          (No patch available, too many successors (2))
   471   
   471   
   472   $ hg update 471597cad322
   472   $ hg update 471597cad322
   473   abort: hidden revision '471597cad322'!
   473   abort: hidden revision '471597cad322'!
   474   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   474   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)