Mercurial > hg-stable
changeset 1427:0980d77f5e9a
Fixed problem with invoking hgmerge on paths with spaces.
| author | michael.w.dales@intel.com |
|---|---|
| date | Mon, 24 Oct 2005 14:54:17 -0700 |
| parents | e84c69b43cdb |
| children | 9346a7fb3fe2 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Oct 24 14:53:36 2005 -0700 +++ b/mercurial/localrepo.py Mon Oct 24 14:54:17 2005 -0700 @@ -1304,7 +1304,7 @@ cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") or "hgmerge") - r = os.system("%s %s %s %s" % (cmd, a, b, c)) + r = os.system('%s "%s" "%s" "%s"' % (cmd, a, b, c)) if r: self.ui.warn(_("merging %s failed!\n") % fn)