--- a/tests/test-amend.t Wed Feb 06 23:21:42 2013 +0000
+++ b/tests/test-amend.t Fri Feb 08 20:18:40 2013 +0000
@@ -68,9 +68,6 @@
-a
$ hg pdiff
$ hg ci -m reseta
- $ hg amend --change 2
- abort: no updates found
- [255]
$ hg debugobsolete
bd19cbe78fbfbd87eb33420c63986fe5f3154f2c a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
@@ -84,30 +81,3 @@
o 2@foo(draft) adda
-Test collapsing into an existing rev, with an intermediate revision.
-
- $ hg branch --force default
- marked working directory as branch default
- (branches are permanent and global, did you want a bookmark?)
- $ hg ci -m resetbranch
- $ hg branch --force foo
- marked working directory as branch foo
- (branches are permanent and global, did you want a bookmark?)
- $ hg amend --change 2
- abort: no updates found
- [255]
- $ hg debugobsolete
- bd19cbe78fbfbd87eb33420c63986fe5f3154f2c a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
- 07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
- 7384bbcba36fde1a789cd00f9cd6f9b919ab5910 0 {'date': '* *', 'user': 'test'} (glob)
- $ glog
- @ 6@foo(draft) amends a34b93d251e49c93d5685ebacad785c73a7e8605
- |
- o 5@default(draft) resetbranch
- |
- o 4@foo(draft) reseta
- |
- o 3@foo(draft) changea
- |
- o 2@foo(draft) adda
-