tests/test-obsolete-rebase.t
changeset 311 5eecfda0a5c7
parent 302 d68ccae92d52
child 346 f4302a2079f4
equal deleted inserted replaced
310:2d0dc5c18489 311:5eecfda0a5c7
    28   $ hg ci -Am addb
    28   $ hg ci -Am addb
    29   adding b
    29   adding b
    30   created new head
    30   created new head
    31   $ echo e > e
    31   $ echo e > e
    32   $ hg ci -Am adde e
    32   $ hg ci -Am adde e
    33   $ hg rebase -d 1 -r . --detach --keep  
    33   $ hg rebase -d 1 -r 3 --detach --keep  
    34   abort: rebase --keep option is unsupported with obsolete extension
    34   $ glog
    35   (see 'hg help obsolete')
    35   @  4:9c5494949763@default(draft) adde
    36   [255]
    36   |
    37   $ hg rebase -d 1 -r . --detach
    37   | o  3:98e4a024635e@default(draft) adde
       
    38   | |
       
    39   | o  2:102a90ea7b4a@default(draft) addb
       
    40   | |
       
    41   o |  1:540395c44225@default(draft) changea
       
    42   |/
       
    43   o  0:07f494440405@default(draft) adda
       
    44   
       
    45   $ glog --hidden
       
    46   @  4:9c5494949763@default(draft) adde
       
    47   |
       
    48   | o  3:98e4a024635e@default(draft) adde
       
    49   | |
       
    50   | o  2:102a90ea7b4a@default(draft) addb
       
    51   | |
       
    52   o |  1:540395c44225@default(draft) changea
       
    53   |/
       
    54   o  0:07f494440405@default(draft) adda
       
    55   
       
    56   $ hg debugsuccessors
       
    57   $ hg --config extensions.hgext.mq= strip tip
       
    58   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    59   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg
       
    60   $ hg rebase -d 1 -r 3 --detach
       
    61   $ glog
       
    62   @  4:9c5494949763@default(draft) adde
       
    63   |
       
    64   | o  2:102a90ea7b4a@default(draft) addb
       
    65   | |
       
    66   o |  1:540395c44225@default(draft) changea
       
    67   |/
       
    68   o  0:07f494440405@default(draft) adda
       
    69   
    38   $ glog --hidden
    70   $ glog --hidden
    39   @  4:9c5494949763@default(draft) adde
    71   @  4:9c5494949763@default(draft) adde
    40   |
    72   |
    41   | o  3:98e4a024635e@default(secret) adde
    73   | o  3:98e4a024635e@default(secret) adde
    42   | |
    74   | |