Commits

Augie Fackler committed 50e0b24

Final test cleanups for 1.9

Comments (0)

Files changed (4)

tests/histedit-helpers.sh

 #!/bin/sh
 
 fixbundle() {
-    grep -v 'saving bundle' | grep -v 'saved backup' | grep -v added | grep -v adding
-}
+    grep -v 'saving bundle' | grep -v 'saved backup' | \
+        grep -v added | grep -v adding | \
+        grep -v "unable to find 'e' for patching" | \
+        grep -v "e: No such file or directory"
+}

tests/test-histedit-fold-non-commute.out

 
 % edit the history
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-unable to find 'e' for patching
 1 out of 1 hunks FAILED -- saving rejects to file e.rej
-e: No such file or directory
 abort: Fix up the change and run hg histedit --continue
 % fix up
 d

tests/test-histedit-non-commute-abort.out

 
 % edit the history
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-unable to find 'e' for patching
 1 out of 1 hunks FAILED -- saving rejects to file e.rej
-e: No such file or directory
 abort: Fix up the change and run hg histedit --continue
 % fix up (pre abort)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-non-commute.out

 
 % edit the history
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-unable to find 'e' for patching
 1 out of 1 hunks FAILED -- saving rejects to file e.rej
-e: No such file or directory
 abort: Fix up the change and run hg histedit --continue
 % abort the edit
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 % edit the history
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-unable to find 'e' for patching
 1 out of 1 hunks FAILED -- saving rejects to file e.rej
-e: No such file or directory
 abort: Fix up the change and run hg histedit --continue
 % fix up
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved