Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.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 | 26a1c617e047 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Mar 09 18:22:24 2015 -0700 +++ b/mercurial/cmdutil.py Tue Mar 10 13:06:38 2015 -0700 @@ -713,7 +713,7 @@ try: files = set() try: - patch.patchrepo(ui, repo, p1, store, tmpname, strip, + patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, files, eolmode=None) except patch.PatchError, e: raise util.Abort(str(e))