# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245060615 -3600
# Node ID b9b551e18502c1d9d726d7df5003caefc2f29fef
# Parent  b21f76520d40fca24acd506563375622988abad9# Parent  0cdbdf79d5e9a30d90ced727a9cbfcb65ee4e5c9
Merge with stable

diff -r b21f76520d40 -r b9b551e18502 hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Jun 09 22:42:39 2009 +0200
+++ b/hgkw/keyword.py	Mon Jun 15 11:10:15 2009 +0100
@@ -485,10 +485,10 @@
                 release(lock, wlock)
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, opener, missing=False):
+    def kwpatchfile_init(orig, self, ui, fname, opener, missing=False, eol=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, opener, missing)
+        orig(self, ui, fname, opener, missing, eol)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)