Mercurial > hg > pyhgsh

comparison mercurial/localrepo.py @ 1349:c6295d2a361e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -0700
parents 88a9c75dc76a
children a0c68981a5f4
comparison
equal deleted inserted replaced
1348:b8c82bf3da21 1349:c6295d2a361e
1285 a = self.wjoin(fn) 1285 a = self.wjoin(fn)
1286 b = temp("base", base) 1286 b = temp("base", base)
1287 c = temp("other", other) 1287 c = temp("other", other)
1288 1288
1289 self.ui.note("resolving %s\n" % fn) 1289 self.ui.note("resolving %s\n" % fn)
1290 self.ui.debug("file %s: other %s ancestor %s\n" % 1290 self.ui.debug("file %s: my %s other %s ancestor %s\n" %
1291 (fn, short(other), short(base))) 1291 (fn, short(my), short(other), short(base)))
1292 1292
1293 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") 1293 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
1294 or "hgmerge") 1294 or "hgmerge")
1295 r = os.system("%s %s %s %s" % (cmd, a, b, c)) 1295 r = os.system("%s %s %s %s" % (cmd, a, b, c))
1296 if r: 1296 if r: