tests/test-obsolete-rebase.t
changeset 279 0d87b1fbf32b
child 280 fd43e3908f09
equal deleted inserted replaced
278:fa0b9b8a83c0 279:0d87b1fbf32b
       
     1   $ cat >> $HGRCPATH <<EOF
       
     2   > [defaults]
       
     3   > amend=-d "0 0"
       
     4   > [extensions]
       
     5   > hgext.rebase=
       
     6   > hgext.graphlog=
       
     7   > EOF
       
     8   $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
       
     9 
       
    10   $ glog() {
       
    11   >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n'\
       
    12   >     "$@"
       
    13   > }
       
    14 
       
    15   $ hg init repo
       
    16   $ cd repo
       
    17   $ echo a > a
       
    18   $ hg ci -Am adda
       
    19   adding a
       
    20   $ echo a >> a
       
    21   $ hg ci -m changea
       
    22 
       
    23 Test regular rebase
       
    24 
       
    25   $ hg up 0
       
    26   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    27   $ echo b > b
       
    28   $ hg ci -Am addb
       
    29   adding b
       
    30   created new head
       
    31   $ hg rebase -d 1
       
    32   $ glog --hidden
       
    33   @  3:03f017c74faa@default(draft) addb
       
    34   |
       
    35   | o  2:102a90ea7b4a@default(secret) addb
       
    36   | |
       
    37   o |  1:540395c44225@default(draft) changea
       
    38   |/
       
    39   o  0:07f494440405@default(draft) adda
       
    40   
       
    41   $ hg debugsuccessors
       
    42   102a90ea7b4a 03f017c74faa
       
    43 
       
    44 Test rebase with deleted empty revision
       
    45 
       
    46   $ hg up 0
       
    47   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    48   $ hg branch foo
       
    49   marked working directory as branch foo
       
    50   (branches are permanent and global, did you want a bookmark?)
       
    51   $ echo a >> a
       
    52   $ hg ci -m changea
       
    53   $ hg rebase -d 1
       
    54   $ glog --hidden
       
    55   o  4:4e322f7ce8e3@foo(secret) changea
       
    56   |
       
    57   | o  3:03f017c74faa@default(draft) addb
       
    58   | |
       
    59   +---o  2:102a90ea7b4a@default(secret) addb
       
    60   | |
       
    61   | @  1:540395c44225@default(draft) changea
       
    62   |/
       
    63   o  0:07f494440405@default(draft) adda
       
    64   
       
    65   $ hg debugsuccessors
       
    66   102a90ea7b4a 03f017c74faa
       
    67   4e322f7ce8e3 000000000000