tests/test-rebase-detach.t
changeset 12608 16b854cb80f1
parent 11208 2313dc4d9817
child 12640 6cc4b14fb76b
equal deleted inserted replaced
12607:1393a81b3bdc 12608:16b854cb80f1
       
     1   $ cat >> $HGRCPATH <<EOF
       
     2   > [extensions]
       
     3   > graphlog=
       
     4   > rebase=
       
     5   > 
       
     6   > [alias]
       
     7   > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
       
     8   > EOF
       
     9 
       
    10 
       
    11   $ hg init a
       
    12   $ cd a
       
    13 
       
    14   $ echo A > A
       
    15   $ hg ci -Am A
       
    16   adding A
       
    17 
       
    18   $ echo B > B
       
    19   $ hg ci -Am B
       
    20   adding B
       
    21 
       
    22   $ echo C > C
       
    23   $ hg ci -Am C
       
    24   adding C
       
    25 
       
    26   $ echo D > D
       
    27   $ hg ci -Am D
       
    28   adding D
       
    29 
       
    30   $ hg up -q -C 0
       
    31 
       
    32   $ echo E > E
       
    33   $ hg ci -Am E
       
    34   adding E
       
    35   created new head
       
    36 
       
    37   $ cd ..
       
    38 
       
    39 
       
    40 Rebasing D onto E detaching from C:
       
    41 
       
    42   $ hg clone -q -u . a a1
       
    43   $ cd a1
       
    44 
       
    45   $ hg tglog
       
    46   @  4: 'E'
       
    47   |
       
    48   | o  3: 'D'
       
    49   | |
       
    50   | o  2: 'C'
       
    51   | |
       
    52   | o  1: 'B'
       
    53   |/
       
    54   o  0: 'A'
       
    55   
       
    56   $ hg rebase --detach -s 3 -d 4
       
    57   saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
       
    58 
       
    59   $ hg tglog
       
    60   @  4: 'D'
       
    61   |
       
    62   o  3: 'E'
       
    63   |
       
    64   | o  2: 'C'
       
    65   | |
       
    66   | o  1: 'B'
       
    67   |/
       
    68   o  0: 'A'
       
    69   
       
    70   $ hg manifest
       
    71   A
       
    72   D
       
    73   E
       
    74 
       
    75   $ cd ..
       
    76 
       
    77 
       
    78 Rebasing C onto E detaching from B:
       
    79 
       
    80   $ hg clone -q -u . a a2
       
    81   $ cd a2
       
    82 
       
    83   $ hg tglog
       
    84   @  4: 'E'
       
    85   |
       
    86   | o  3: 'D'
       
    87   | |
       
    88   | o  2: 'C'
       
    89   | |
       
    90   | o  1: 'B'
       
    91   |/
       
    92   o  0: 'A'
       
    93   
       
    94   $ hg rebase --detach -s 2 -d 4
       
    95   saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
       
    96 
       
    97   $ hg tglog
       
    98   @  4: 'D'
       
    99   |
       
   100   o  3: 'C'
       
   101   |
       
   102   o  2: 'E'
       
   103   |
       
   104   | o  1: 'B'
       
   105   |/
       
   106   o  0: 'A'
       
   107   
       
   108   $ hg manifest
       
   109   A
       
   110   C
       
   111   D
       
   112   E
       
   113 
       
   114   $ cd ..
       
   115 
       
   116 
       
   117 Rebasing B onto E using detach (same as not using it):
       
   118 
       
   119   $ hg clone -q -u . a a3
       
   120   $ cd a3
       
   121 
       
   122   $ hg tglog
       
   123   @  4: 'E'
       
   124   |
       
   125   | o  3: 'D'
       
   126   | |
       
   127   | o  2: 'C'
       
   128   | |
       
   129   | o  1: 'B'
       
   130   |/
       
   131   o  0: 'A'
       
   132   
       
   133   $ hg rebase --detach -s 1 -d 4
       
   134   saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
       
   135 
       
   136   $ hg tglog
       
   137   @  4: 'D'
       
   138   |
       
   139   o  3: 'C'
       
   140   |
       
   141   o  2: 'B'
       
   142   |
       
   143   o  1: 'E'
       
   144   |
       
   145   o  0: 'A'
       
   146   
       
   147   $ hg manifest
       
   148   A
       
   149   B
       
   150   C
       
   151   D
       
   152   E
       
   153 
       
   154   $ cd ..
       
   155 
       
   156 
       
   157 Rebasing C onto E detaching from B and collapsing:
       
   158 
       
   159   $ hg clone -q -u . a a4
       
   160   $ cd a4
       
   161 
       
   162   $ hg tglog
       
   163   @  4: 'E'
       
   164   |
       
   165   | o  3: 'D'
       
   166   | |
       
   167   | o  2: 'C'
       
   168   | |
       
   169   | o  1: 'B'
       
   170   |/
       
   171   o  0: 'A'
       
   172   
       
   173   $ hg rebase --detach --collapse -s 2 -d 4
       
   174   saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
       
   175 
       
   176   $ hg tglog
       
   177   @  3: 'Collapsed revision
       
   178   |  * C
       
   179   |  * D'
       
   180   o  2: 'E'
       
   181   |
       
   182   | o  1: 'B'
       
   183   |/
       
   184   o  0: 'A'
       
   185   
       
   186   $ hg manifest
       
   187   A
       
   188   C
       
   189   D
       
   190   E
       
   191 
       
   192   $ cd ..
       
   193