--- a/tests/test-amend.t	Tue Oct 15 16:20:17 2013 +0200
+++ b/tests/test-amend.t	Wed Oct 16 00:37:29 2013 +0200
@@ -24,20 +24,20 @@
   (branches are permanent and global, did you want a bookmark?)
   $ hg amend
   $ hg debugobsolete
-  07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
-  bd19cbe78fbfbd87eb33420c63986fe5f3154f2c 0 {'date': '* *', 'user': 'test'} (glob)
+  07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 {'date': '* *', 'user': 'test'} (glob)
+  b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {'date': '* *', 'user': 'test'} (glob)
   $ hg branch
   foo
   $ hg branches
-  foo                            2:a34b93d251e4
+  foo                            2:6a022cbb61d5
   $ glog
   @  2@foo(draft) adda
   
 Test no-op
 
   $ hg amend
-  abort: no updates found
-  [255]
+  nothing changed
+  [1]
   $ glog
   @  2@foo(draft) adda
   
@@ -45,8 +45,8 @@
 Test forcing the message to the same value, no intermediate revision.
 
   $ hg amend -m 'adda'
-  abort: no updates found
-  [255]
+  nothing changed
+  [1]
   $ glog
   @  2@foo(draft) adda
   
@@ -60,7 +60,7 @@
   M a
   $ hg pstatus
   $ hg diff
-  diff -r 2f97fe38810f a
+  diff -r f7a50201fe3a a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* +0000 (glob)
   @@ -1,2 +1,1 @@
@@ -69,8 +69,8 @@
   $ hg pdiff
   $ hg ci -m reseta
   $ hg debugobsolete
-  07f4944404050f47db2e5c5071e0e84e7a27bba9 a34b93d251e49c93d5685ebacad785c73a7e8605 0 {'date': '* *', 'user': 'test'} (glob)
-  bd19cbe78fbfbd87eb33420c63986fe5f3154f2c 0 {'date': '* *', 'user': 'test'} (glob)
+  07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 {'date': '* *', 'user': 'test'} (glob)
+  b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {'date': '* *', 'user': 'test'} (glob)
   $ hg phase 2
   2: draft
   $ glog