Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 24260:76225ab5a5da
cmdutil.tryimportone: allow importing relative patches with --bypass
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 10 Mar 2015 13:06:38 -0700 |
parents | 5ac8ce04baa2 |
children | 20aac24e2114 |
line wrap: on
line diff
--- a/mercurial/patch.py Mon Mar 09 18:22:24 2015 -0700 +++ b/mercurial/patch.py Tue Mar 10 13:06:38 2015 -0700 @@ -1528,10 +1528,10 @@ backend = workingbackend(ui, repo, similarity) return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) -def patchrepo(ui, repo, ctx, store, patchobj, strip, files=None, +def patchrepo(ui, repo, ctx, store, patchobj, strip, prefix, files=None, eolmode='strict'): backend = repobackend(ui, repo, ctx, store) - return patchbackend(ui, backend, patchobj, strip, '', files, eolmode) + return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) def patch(ui, repo, patchname, strip=1, prefix='', files=None, eolmode='strict', similarity=0):