--- patch.py.old	2018-03-09 07:53:37.586201595 -0800
+++ patch.py	2018-03-09 09:17:25.017418754 -0800
@@ -804,10 +804,10 @@
 
   def findfile(self, old, new):
     """ return name of file to be patched or None """
-    if exists(old):
-      return old
-    elif exists(new):
+    if exists(new):
       return new
+    elif exists(old):
+      return old
     else:
       # [w] Google Code generates broken patches with its online editor
       debug("broken patch from Google Code, stripping prefixes..")

@@ -827,9 +827,6 @@
         from file paths. `root` parameter specifies working dir.
         return True on success
     """
-    if root:
-      prevdir = os.getcwd()
-      os.chdir(root)
 
     total = len(self.items)
     errors = 0

@@ -854,6 +851,8 @@
         new = pathstrip(p.target, strip)
       else:
         old, new = p.source, p.target
+      old = os.path.join(root, old)
+      new = os.path.join(root, new)
 
       filename = self.findfile(old, new)
 

@@ -956,9 +955,6 @@
             # todo: proper rejects
             shutil.move(backupname, filename)
 
-    if root:
-      os.chdir(prevdir)
-
     # todo: check for premature eof
     return (errors == 0)