tests/test-rebase-newancestor.t
changeset 23426 19ebd2f88fc7
parent 23408 36dcd3db70ab
child 23516 328afbad6e57
equal deleted inserted replaced
23411:2d86f4e38c08 23426:19ebd2f88fc7
   125 Full rebase all the way back from branching point:
   125 Full rebase all the way back from branching point:
   126 
   126 
   127   $ hg rebase -r 'only(dev,default)' -d default
   127   $ hg rebase -r 'only(dev,default)' -d default
   128   remote changed f-default which local deleted
   128   remote changed f-default which local deleted
   129   use (c)hanged version or leave (d)eleted? c
   129   use (c)hanged version or leave (d)eleted? c
   130   local changed f-default which remote deleted
       
   131   use (c)hanged version or (d)elete? c
       
   132   saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob)
   130   saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob)
   133   $ hg tglog
   131   $ hg tglog
       
   132   o  6: 'dev: merge default'
       
   133   |
   134   o  5: 'dev: merge default'
   134   o  5: 'dev: merge default'
   135   |
   135   |
   136   o  4: 'dev: f-dev stuff'
   136   o  4: 'dev: f-dev stuff'
   137   |
   137   |
   138   @  3: 'default: f-other stuff'
   138   @  3: 'default: f-other stuff'
   149 
   149 
   150   $ hg phase -fdr0:
   150   $ hg phase -fdr0:
   151   $ hg rebase -r 'children(only(dev,default))' -d default
   151   $ hg rebase -r 'children(only(dev,default))' -d default
   152   remote changed f-default which local deleted
   152   remote changed f-default which local deleted
   153   use (c)hanged version or leave (d)eleted? c
   153   use (c)hanged version or leave (d)eleted? c
   154   local changed f-default which remote deleted
       
   155   use (c)hanged version or (d)elete? c
       
   156   saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob)
   154   saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob)
   157   $ hg tglog
   155   $ hg tglog
       
   156   o  7: 'dev: merge default'
       
   157   |
   158   o  6: 'dev: merge default'
   158   o  6: 'dev: merge default'
   159   |
   159   |
   160   o  5: 'dev: f-dev stuff'
   160   o  5: 'dev: f-dev stuff'
   161   |
   161   |
   162   o  4: 'default: f-other stuff'
   162   o  4: 'default: f-other stuff'