Mercurial > public > mercurial-scm > hg-stable

diff tests/run-tests.py @ 4387:93a4e72b4f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents 46280c004f22
children 860478527568
line wrap: on
line diff
--- a/tests/run-tests.py	Thu Apr 26 23:58:18 2007 -0700
+++ b/tests/run-tests.py	Sat Apr 28 17:55:45 2007 -0300
@@ -346,8 +346,9 @@
 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
 
 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
-os.environ["HGMERGE"]  = 'python "%s"' % os.path.join(TESTDIR, os.path.pardir,
-                                                      'contrib', 'simplemerge')
+os.environ["HGMERGE"]  = ('python "%s" -L my -L other'
+                          % os.path.join(TESTDIR, os.path.pardir, 'contrib',
+                                         'simplemerge'))
 os.environ["HGUSER"]   = "test"
 os.environ["HGENCODING"] = "ascii"
 os.environ["HGENCODINGMODE"] = "strict"