tests/test-tutorial.t
branchstable
changeset 635 0f5ff3b36144
parent 634 e763f7e94211
child 636 27c890b4f864
equal deleted inserted replaced
634:e763f7e94211 635:0f5ff3b36144
   417 
   417 
   418 
   418 
   419 Splitting change
   419 Splitting change
   420 ------------------
   420 ------------------
   421 
   421 
   422 To be done (currently achieve with "two commit + debugobsolete")
   422 histedit or uncommit
   423 
   423 
   424 Collapsing change
   424 Collapsing change
   425 ------------------
   425 ------------------
   426 
   426 
   427 To be done (currently achieve with "revert + debugobsolete" or "rebase --collapse")
   427 This can be done with hg fold but the tutorial part is not written yet.
   428 
       
   429 
   428 
   430 
   429 
   431 
   430 
   432 
   431 
   433 
   432 
   761 
   760 
   762 
   761 
   763 Handling Conflicting amend
   762 Handling Conflicting amend
   764 ----------------------------------------------
   763 ----------------------------------------------
   765 
   764 
   766 We can detect that multiple diverging//conflicting amend have been made. There
   765 We can detect that multiple diverging//conflicting amend have been made.
   767 will be a "evol-merge" command to merge conflicting amend
   766 hg evolve is able to solve several of them
   768 
   767 
   769 This command is not ready yet.
   768 This section need to be written