Changeset e82a3dd94efa…
Parent 243ddad19471…
by
Changes to 2 files · Browse files at e82a3dd94efa Showing diff from parent 243ddad19471 Diff from another changeset...
@@ -463,8 +463,13 @@ if dopatch:
try:
pfiles = {}
- patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
+ if patch.patchfile.__bases__:
+ # Mercurial 1.3
+ patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
eolmode=None)
+ else:
+ # Mercurial 1.2
+ patch.internalpatch(fp, ui, 1, repo.root, files=pfiles)
patch.updatedir(ui, repo, pfiles)
except patch.PatchError, err:
s = str(err)
|
@@ -501,7 +501,7 @@ if dopatch:
ui.debug(_('applying patch\n'))
ui.debug(fp.getvalue())
- if hasattr(patch, 'linereader'):
+ if patch.patchfile.__bases__:
# Mercurial 1.3
patch.internalpatch(fp, ui, 1, repo.root, eolmode=None)
else:
|
Loading...