- When applying a patch with -q and without -f no (individual)

  reject files are created, and the "patching file" comments
  are missing as well. In that case, we don't know wich files the
  "-- saving rejects to file /tmp/foo" comments belong to, and we
  can't fic them up. Remove them, instead.
- Pop command: Touch files after they are restored so that tools
  like make don't get confused.
- Update test cases.
- Bump to version 0.37.

3 files changed, 2 insertions, 3 deletions

diff --git a/test/conflicts.test b/test/conflicts.test
index fe250e8..99aed92 100644
--- a/test/conflicts.test
+++ b/test/conflicts.test
@@ -60,7 +60,7 @@ anymore, then the patch is fixed.
 	$ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt
 	$ quilt push -q
 	> Applying patch %{P}a.diff
-	> 1 out of 2 hunks FAILED -- rejects in file one.txt
+	> 1 out of 2 hunks FAILED
 	> Patch %{P}a.diff does not apply (enforce with -f)
 
 	$ quilt push -qf
diff --git a/test/failpop.test b/test/failpop.test
index 9cd3ed0..9c6df53 100644
--- a/test/failpop.test
+++ b/test/failpop.test
@@ -21,7 +21,7 @@
 	$ sed -e "s/ /_/g" patches/test.diff > patches/test.new
 	$ mv patches/test.new patches/test.diff
 	$ quilt pop
-	> Patch %{P}test.diff does not remove cleanly (enforce with -f)
+	> Patch %{P}test.diff does not remove cleanly (refresh it or enforce with -f)
 
 	$ cd ..
 	$ rm -rf d
diff --git a/test/new-nosubdir.test b/test/new-nosubdir.test
index 176cfcf..97d8e98 100644
--- a/test/new-nosubdir.test
+++ b/test/new-nosubdir.test
@@ -4,7 +4,6 @@
 	$ mkdir patches sub
 	$ cd sub
 	$ quilt new here.diff
-	> Warning: directory ../patches exists; ignoring
 	> Patch %{_P}here.diff is now on top
 
 	$ cd ../..