# HG changeset patch # User Alexis S. L. Carvalho # Date 2007-04-16 23:17:39 # Node ID 46280c004f224017da0a45935e383a8563847496 # Parent d5c3a70f8422359bfd611cf5b8a3608a2fe878f7 change tests to use simplemerge by default diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -19,7 +19,7 @@ import sys import tempfile import time -required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"] +required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] parser = optparse.OptionParser("%prog [options] [tests]") parser.add_option("-v", "--verbose", action="store_true", @@ -340,17 +340,18 @@ check_required_tools() os.environ['LANG'] = os.environ['LC_ALL'] = 'C' os.environ['TZ'] = 'GMT' -os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' -os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"' -os.environ["HGUSER"] = "test" -os.environ["HGENCODING"] = "ascii" -os.environ["HGENCODINGMODE"] = "strict" - TESTDIR = os.environ["TESTDIR"] = os.getcwd() HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.") DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') 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["HGUSER"] = "test" +os.environ["HGENCODING"] = "ascii" +os.environ["HGENCODINGMODE"] = "strict" + vlog("# Using TESTDIR", TESTDIR) vlog("# Using HGTMP", HGTMP) diff --git a/tests/test-annotate b/tests/test-annotate --- a/tests/test-annotate +++ b/tests/test-annotate @@ -1,5 +1,7 @@ #!/bin/sh +HGMERGE=true; export HGMERGE + echo % init hg init diff --git a/tests/test-backout b/tests/test-backout --- a/tests/test-backout +++ b/tests/test-backout @@ -1,5 +1,7 @@ #!/bin/sh +HGMERGE=true; export HGMERGE + echo '# basic operation' hg init basic cd basic diff --git a/tests/test-conflict b/tests/test-conflict --- a/tests/test-conflict +++ b/tests/test-conflict @@ -9,7 +9,6 @@ hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" -HGMERGE=merge; export HGMERGE hg merge 1 hg id egrep -v ">>>|<<<" a diff --git a/tests/test-conflict.out b/tests/test-conflict.out --- a/tests/test-conflict.out +++ b/tests/test-conflict.out @@ -1,5 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -merge: warning: conflicts during merge +warning: conflicts during merge. merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved diff --git a/tests/test-globalopts b/tests/test-globalopts --- a/tests/test-globalopts +++ b/tests/test-globalopts @@ -17,7 +17,7 @@ cd .. hg clone a c cd c hg pull -f ../b -HGMERGE=merge hg merge +hg merge cd .. diff --git a/tests/test-install b/tests/test-install --- a/tests/test-install +++ b/tests/test-install @@ -1,3 +1,3 @@ #!/bin/sh -HGMERGE=merge hg debuginstall +hg debuginstall diff --git a/tests/test-merge-commit b/tests/test-merge-commit --- a/tests/test-merge-commit +++ b/tests/test-merge-commit @@ -1,9 +1,6 @@ #!/bin/sh # check that renames are correctly saved by a commit after a merge -HGMERGE=merge -export HGMERGE - # test with the merge on 3 having the rename on the local parent hg init a cd a diff --git a/tests/test-merge-local b/tests/test-merge-local --- a/tests/test-merge-local +++ b/tests/test-merge-local @@ -38,13 +38,13 @@ hg diff --nodates | grep "^[+-][^<>]" hg st echo "# local merge with conflicts" -HGMERGE=merge hg co +hg co hg co 0 hg diff --nodates | grep "^[+-][^<>]" hg st echo "# local merge without conflicts" hg revert zzz2_merge_bad -HGMERGE=merge hg co +hg co hg diff --nodates | grep "^[+-][^<>]" hg st diff --git a/tests/test-merge-local.out b/tests/test-merge-local.out --- a/tests/test-merge-local.out +++ b/tests/test-merge-local.out @@ -36,7 +36,7 @@ 2 files updated, 0 files merged, 3 files M zzz1_merge_ok M zzz2_merge_bad # local merge with conflicts -merge: warning: conflicts during merge +warning: conflicts during merge. merging zzz1_merge_ok merging zzz2_merge_bad merging zzz2_merge_bad failed! diff --git a/tests/test-merge-revert b/tests/test-merge-revert --- a/tests/test-merge-revert +++ b/tests/test-merge-revert @@ -25,7 +25,7 @@ hg status hg id hg update -C 0 echo "changed file1" >> file1 -HGMERGE=merge hg update +hg update hg diff hg status hg id diff --git a/tests/test-merge-revert2 b/tests/test-merge-revert2 --- a/tests/test-merge-revert2 +++ b/tests/test-merge-revert2 @@ -26,7 +26,7 @@ hg status hg id hg update -C 0 echo "changed file1 different" >> file1 -HGMERGE=merge hg update +hg update hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out --- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -9,7 +9,7 @@ 9eca13a34789 1 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -merge: warning: conflicts during merge +warning: conflicts during merge. merging file1 merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved diff --git a/tests/test-merge7 b/tests/test-merge7 --- a/tests/test-merge7 +++ b/tests/test-merge7 @@ -35,7 +35,7 @@ hg commit -m "2 -> 2.5" -d "1000000 0" # now pull and merge from test-a hg pull ../test-a -HGMERGE=merge hg merge +hg merge # resolve conflict cat >test.txt <<"EOF" one @@ -57,7 +57,7 @@ hg commit -m "two -> two-point-one" -d " # pull and merge from test-a again cd ../test-b hg pull ../test-a -HGMERGE=merge hg merge --debug +hg merge --debug cat test.txt | sed "s% .*%%" diff --git a/tests/test-merge7.out b/tests/test-merge7.out --- a/tests/test-merge7.out +++ b/tests/test-merge7.out @@ -6,7 +6,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -merge: warning: conflicts during merge +warning: conflicts during merge. merging test.txt merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -20,7 +20,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -merge: warning: conflicts during merge +warning: conflicts during merge. resolving manifests overwrite None partial False ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 diff --git a/tests/test-up-local-change b/tests/test-up-local-change --- a/tests/test-up-local-change +++ b/tests/test-up-local-change @@ -1,5 +1,7 @@ #!/bin/sh +HGMERGE=true; export HGMERGE + set -e mkdir r1 cd r1