Changeset 28389e72f6c5…
Parent 62376638b87b…
by
Changes to one file · Browse files at 28389e72f6c5 Showing diff from parent 62376638b87b Diff from another changeset...
@@ -501,7 +501,12 @@ if dopatch:
ui.debug(_('applying patch\n'))
ui.debug(fp.getvalue())
- patch.internalpatch(fp, ui, 1, repo.root, eolmode=None)
+ if hasattr(patch, 'linereader'):
+ # Mercurial 1.3
+ patch.internalpatch(fp, ui, 1, repo.root, eolmode=None)
+ else:
+ # Mercurial 1.2
+ patch.internalpatch(fp, ui, 1, repo.root)
del fp
# 3c. apply filtered patch to clean repo (shelve)
|
Loading...