tests/test-amend.t
changeset 441 d702f0d26c6a
parent 385 cdcdedc532b7
child 443 3f8c11865ed2
equal deleted inserted replaced
440:5fa287e5087e 441:d702f0d26c6a
    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
    27   $ hg debugobsolete
    28   07f494440405 a34b93d251e4
    28   07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    29   bd19cbe78fbf a34b93d251e4
    29   bd19cbe78fbfbd87eb33420c63986fe5f3154f2c a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    30   $ hg branch
    30   $ hg branch
    31   foo
    31   foo
    32   $ hg branches
    32   $ hg branches
    33   foo                            2:a34b93d251e4
    33   foo                            2:a34b93d251e4
    34   default                        0:07f494440405 (inactive)
    34   default                        0:07f494440405 (inactive)
    60   $ echo a > a
    60   $ echo a > a
    61   $ hg ci -m reseta
    61   $ hg ci -m reseta
    62   $ hg amend --change 2
    62   $ hg amend --change 2
    63   abort: no updates found
    63   abort: no updates found
    64   [255]
    64   [255]
    65   $ hg debugsuccessors
    65   $ hg debugobsolete
    66   07f494440405 a34b93d251e4
    66   07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    67   bd19cbe78fbf a34b93d251e4
    67   bd19cbe78fbfbd87eb33420c63986fe5f3154f2c a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    68   $ hg phase 2
    68   $ hg phase 2
    69   2: draft
    69   2: draft
    70   $ glog
    70   $ glog
    71   @  4@foo(draft) reseta
    71   @  4@foo(draft) reseta
    72   |
    72   |
    86   marked working directory as branch foo
    86   marked working directory as branch foo
    87   (branches are permanent and global, did you want a bookmark?)
    87   (branches are permanent and global, did you want a bookmark?)
    88   $ hg amend --change 2
    88   $ hg amend --change 2
    89   abort: no updates found
    89   abort: no updates found
    90   [255]
    90   [255]
    91   $ hg debugsuccessors
    91   $ hg debugobsolete
    92   07f494440405 a34b93d251e4
    92   07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    93   7384bbcba36f 000000000000
    93   bd19cbe78fbfbd87eb33420c63986fe5f3154f2c a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
    94   bd19cbe78fbf a34b93d251e4
    94   7384bbcba36fde1a789cd00f9cd6f9b919ab5910 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob)
    95   $ glog
    95   $ glog
    96   @  6@foo(draft) amends a34b93d251e49c93d5685ebacad785c73a7e8605
    96   @  6@foo(draft) amends a34b93d251e49c93d5685ebacad785c73a7e8605
    97   |
    97   |
    98   o  5@default(draft) resetbranch
    98   o  5@default(draft) resetbranch
    99   |
    99   |