Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 1427:0980d77f5e9a

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.
author michael.w.dales@intel.com
date Mon, 24 Oct 2005 14:54:17 -0700
parents c6e6ca96a033
children 508a3f559553
comparison
equal deleted inserted replaced
1426:e84c69b43cdb 1427:0980d77f5e9a
1302 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") % 1302 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") %
1303 (fn, short(my), short(other), short(base))) 1303 (fn, short(my), short(other), short(base)))
1304 1304
1305 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") 1305 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
1306 or "hgmerge") 1306 or "hgmerge")
1307 r = os.system("%s %s %s %s" % (cmd, a, b, c)) 1307 r = os.system('%s "%s" "%s" "%s"' % (cmd, a, b, c))
1308 if r: 1308 if r:
1309 self.ui.warn(_("merging %s failed!\n") % fn) 1309 self.ui.warn(_("merging %s failed!\n") % fn)
1310 1310
1311 os.unlink(b) 1311 os.unlink(b)
1312 os.unlink(c) 1312 os.unlink(c)