Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed problem with invoking hgmerge on paths with spaces.
authormichael.w.dales@intel.com
Mon, 24 Oct 2005 14:54:17 -0700
changeset 1427 0980d77f5e9a
parent 1426 e84c69b43cdb
child 1428 9346a7fb3fe2
Fixed problem with invoking hgmerge on paths with spaces.
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial