tests/test-amend.t
changeset 273 87e4d1eec5e8
parent 265 24943df310d4
child 302 d68ccae92d52
equal deleted inserted replaced
272:78d01e341438 273:87e4d1eec5e8
    22 
    22 
    23   $ hg branch foo
    23   $ hg branch foo
    24   marked working directory as branch foo
    24   marked working directory as branch foo
    25   (branches are permanent and global, did you want a bookmark?)
    25   (branches are permanent and global, did you want a bookmark?)
    26   $ hg amend
    26   $ hg amend
       
    27   $ hg debugsuccessors
       
    28   07f494440405 a34b93d251e4
       
    29   07f494440405 bd19cbe78fbf
       
    30   bd19cbe78fbf a34b93d251e4
    27   $ hg branch
    31   $ hg branch
    28   foo
    32   foo
    29   $ hg branches
    33   $ hg branches
    30   foo                            2:a34b93d251e4
    34   foo                            2:a34b93d251e4
    31   default                        0:07f494440405 (inactive)
    35   default                        0:07f494440405 (inactive)
    57   $ echo a > a
    61   $ echo a > a
    58   $ hg ci -m reseta
    62   $ hg ci -m reseta
    59   $ hg amend --change 2
    63   $ hg amend --change 2
    60   abort: no updates found
    64   abort: no updates found
    61   [255]
    65   [255]
       
    66   $ hg debugsuccessors
       
    67   07f494440405 a34b93d251e4
       
    68   07f494440405 bd19cbe78fbf
       
    69   bd19cbe78fbf a34b93d251e4
    62   $ hg phase 2
    70   $ hg phase 2
    63   2: draft
    71   2: draft
    64   $ glog
    72   $ glog
    65   @  4@foo(draft) reseta
    73   @  4@foo(draft) reseta
    66   |
    74   |
    80   marked working directory as branch foo
    88   marked working directory as branch foo
    81   (branches are permanent and global, did you want a bookmark?)
    89   (branches are permanent and global, did you want a bookmark?)
    82   $ hg amend --change 2
    90   $ hg amend --change 2
    83   abort: no updates found
    91   abort: no updates found
    84   [255]
    92   [255]
       
    93   $ hg debugsuccessors
       
    94   07f494440405 a34b93d251e4
       
    95   07f494440405 bd19cbe78fbf
       
    96   7384bbcba36f 000000000000
       
    97   bd19cbe78fbf a34b93d251e4
    85   $ glog
    98   $ glog
    86   @  6@foo(secret) amends a34b93d251e49c93d5685ebacad785c73a7e8605
    99   @  6@foo(secret) amends a34b93d251e49c93d5685ebacad785c73a7e8605
    87   |
   100   |
    88   o  5@default(draft) resetbranch
   101   o  5@default(draft) resetbranch
    89   |
   102   |