tests/test-amend-patch.t
changeset 3661 61fdd25542a6
parent 3660 f018656ca3bf
child 3716 e5ba6531503e
child 3876 c464abfd7f9d
--- a/tests/test-amend-patch.t	Sun Mar 18 23:48:06 2018 +0530
+++ b/tests/test-amend-patch.t	Wed Apr 11 07:23:34 2018 +0200
@@ -139,8 +139,10 @@
   > EOF
 
   $ HGEDITOR="sh ./editor.sh" hg amend --patch
-  abort: bad hunk #1 @@ -0,0 +1,1 @@
+  failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@
    (1 0 1 1)
+  try to fix the patch (yn)? y
+  abort: patch unchanged
   [255]
 
 Having deletions which dont exists
@@ -166,8 +168,10 @@
   > EOF
 
   $ HGEDITOR="sh ./editor.sh" hg amend --patch
-  abort: bad hunk #1 @@ -0,0 +1,1 @@
+  failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@
    (1 0 1 1)
+  try to fix the patch (yn)? y
+  abort: patch unchanged
   [255]
 
 Changing the file mode using amend --patch
@@ -325,7 +329,9 @@
   $ HGEDITOR="sh ./editor.sh" hg amend --patch
   patching file changedfile
   Hunk #1 FAILED at 0
-  abort: patch failed to apply
+  failed to apply edited patch: patch failed to apply
+  try to fix the patch (yn)? y
+  abort: patch unchanged
   [255]
 
 Add more addition to the patch
@@ -733,7 +739,7 @@
   @@ -1,2 +0,0 @@
   -foobar
   -babar
-  abort: nothing changed
+  abort: patch unchanged
   [255]
 
   $ HGEDITOR=cat hg amend --patch doesnotexists