Show More
@@ -471,10 +471,10 b' def reposetup(ui, repo):' | |||||
471 |
|
471 | |||
472 | # monkeypatches |
|
472 | # monkeypatches | |
473 | def kwpatchfile_init(orig, self, ui, fname, opener, |
|
473 | def kwpatchfile_init(orig, self, ui, fname, opener, | |
474 | missing=False, eol=None): |
|
474 | missing=False, eolmode=None): | |
475 | '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
|
475 | '''Monkeypatch/wrap patch.patchfile.__init__ to avoid | |
476 | rejects or conflicts due to expanded keywords in working dir.''' |
|
476 | rejects or conflicts due to expanded keywords in working dir.''' | |
477 | orig(self, ui, fname, opener, missing, eol) |
|
477 | orig(self, ui, fname, opener, missing, eolmode) | |
478 | # shrink keywords read from working dir |
|
478 | # shrink keywords read from working dir | |
479 | self.lines = kwt.shrinklines(self.fname, self.lines) |
|
479 | self.lines = kwt.shrinklines(self.fname, self.lines) | |
480 |
|
480 |
General Comments 0
You need to be logged in to leave comments.
Login now