tests/test-rebase-collapse.t
changeset 13661 ee349e228835
parent 12640 6cc4b14fb76b
child 14119 624e5ce615ec
equal deleted inserted replaced
13660:a56c1b2bff18 13661:ee349e228835
   135   F
   135   F
   136   H
   136   H
   137 
   137 
   138   $ cd ..
   138   $ cd ..
   139 
   139 
       
   140 Rebasing G onto H with custom message:
       
   141 
       
   142   $ hg clone -q -u . a a3
       
   143   $ cd a3
       
   144 
       
   145   $ hg rebase --base 6 -m 'custom message'
       
   146   abort: message can only be specified with collapse
       
   147   [255]
       
   148 
       
   149   $ hg rebase --base 6 --collapse -m 'custom message'
       
   150   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
       
   151 
       
   152   $ hg tglog
       
   153   @  6: 'custom message'
       
   154   |
       
   155   o  5: 'H'
       
   156   |
       
   157   o  4: 'F'
       
   158   |
       
   159   | o  3: 'D'
       
   160   | |
       
   161   | o  2: 'C'
       
   162   | |
       
   163   | o  1: 'B'
       
   164   |/
       
   165   o  0: 'A'
       
   166   
       
   167   $ hg manifest
       
   168   A
       
   169   E
       
   170   F
       
   171   H
       
   172 
       
   173   $ cd ..
   140 
   174 
   141 Create repo b:
   175 Create repo b:
   142 
   176 
   143   $ hg init b
   177   $ hg init b
   144   $ cd b
   178   $ cd b