# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1134753188 21600
# Node ID a329e0fda2ae93ada0534fa71b507b06314f6320
# Parent  347c44611348e768d24998a48101903ebcc34570# Parent  6bb3463b124bfd950323fb4a91395ea55fab8030
Merge with crew



diff -r 347c44611348 -r a329e0fda2ae mercurial/util.py
--- a/mercurial/util.py	Fri Dec 16 11:12:08 2005 -0600
+++ b/mercurial/util.py	Fri Dec 16 11:13:08 2005 -0600
@@ -525,7 +525,10 @@
 
     def parse_patch_output(output_line):
         """parses the output produced by patch and returns the file name"""
-        return output_line[14:]
+        pf = output_line[14:]
+        if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
+            pf = pf[1:-1] # Remove the quotes
+        return pf
 
     def is_exec(f, last):
         """check whether a file is executable"""