Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 149:8cd45e152c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass filename to $HGMERGE This lets the merge program be slightly more user-friendly
author mpm@selenic.com
date Tue, 24 May 2005 23:34:06 -0800
parents c32286d0a665
children 1f6c61a60586
comparison
equal deleted inserted replaced
148:c32286d0a665 149:8cd45e152c83
774 b = temp("remote", other) 774 b = temp("remote", other)
775 c = temp("parent", base) 775 c = temp("parent", base)
776 776
777 cmd = os.environ["HGMERGE"] 777 cmd = os.environ["HGMERGE"]
778 self.ui.debug("invoking merge with %s\n" % cmd) 778 self.ui.debug("invoking merge with %s\n" % cmd)
779 r = os.system("%s %s %s %s" % (cmd, a, b, c)) 779 r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn))
780 if r: 780 if r:
781 raise "Merge failed!" 781 raise "Merge failed!"
782 782
783 text = open(a).read() 783 text = open(a).read()
784 os.unlink(a) 784 os.unlink(a)