Commits

Anonymous committed bf3d21f

workaround for issue1763 in hg bts

  • Participants
  • Parent commits af3232a

Comments (0)

Files changed (1)

 
         def applydiff(name):
             files = {}
-            patch.patch(patchfile, self.ui, strip=1, files=files)
-            patch.updatedir(self.ui, repo, files, similarity=sim/100.)
+            patch.patch(self.join(patchfile), self.ui, strip=1, files=files)
+            files2 = {}
+            for k in files.keys():
+                files2[k.strip('\r')]=files[k]
+            patch.updatedir(self.ui, repo, files2, similarity=sim/100.)
 
         opener = util.opener('.hg/attic')
         smo = extensions.wrapfunction(simplemerge, 'simplemerge', smwrapper)