Mercurial > hg-stable
changeset 4387:93a4e72b4f83
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 | 1386a9cffc88 |
| children | f9cd48bd8625 |
| files | tests/run-tests.py tests/test-conflict tests/test-conflict.out tests/test-merge-revert2 tests/test-merge-revert2.out tests/test-merge7 tests/test-merge7.out |
| diffstat | 7 files changed, 12 insertions(+), 9 deletions(-) [+] |
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"
--- a/tests/test-conflict Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-conflict Sat Apr 28 17:55:45 2007 -0300 @@ -11,5 +11,5 @@ hg commit -m branch2 -d "1000000 0" hg merge 1 hg id -egrep -v ">>>|<<<" a +cat a hg status
--- a/tests/test-conflict.out Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-conflict.out Sat Apr 28 17:55:45 2007 -0300 @@ -7,7 +7,9 @@ hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip +<<<<<<< my something else ======= something +>>>>>>> other M a
--- a/tests/test-merge-revert2 Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-merge-revert2 Sat Apr 28 17:55:45 2007 -0300 @@ -27,7 +27,7 @@ hg update -C 0 echo "changed file1 different" >> file1 hg update -hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" +hg diff --nodates hg status hg id hg revert --no-backup --all
--- a/tests/test-merge-revert2.out Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-merge-revert2.out Sat Apr 28 17:55:45 2007 -0300 @@ -23,11 +23,11 @@ @@ -1,3 +1,7 @@ added file1 added file1 another line of text -+<<<<<<< ++<<<<<<< my +changed file1 different +======= changed file1 -+>>>>>>> ++>>>>>>> other M file1 f248da0d4c3e+ tip reverting file1
--- a/tests/test-merge7 Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-merge7 Sat Apr 28 17:55:45 2007 -0300 @@ -59,7 +59,7 @@ hg pull ../test-a hg merge --debug -cat test.txt | sed "s% .*%%" +cat test.txt hg debugindex .hg/store/data/test.txt.i
--- a/tests/test-merge7.out Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-merge7.out Sat Apr 28 17:55:45 2007 -0300 @@ -33,11 +33,11 @@ hg update -C 3 hg merge 4 one -<<<<<<< +<<<<<<< my two-point-five ======= two-point-one ->>>>>>> +>>>>>>> other three rev offset length base linkrev nodeid p1 p2 0 0 7 0 0 01365c4cca56 000000000000 000000000000