remote-hg: tests: fix hg merge

Let's specify a merge tool, otherwise mercurial might open one and hang
our tests waiting for user input.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh
index 1a212b88b0da147bdd5d2f5da53a6870a2198e57..e0dbebf0500c6ebfdc465eb5422adf8c95d7a32e 100755 (executable)
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh
@@ -104,11 +104,12 @@ setup () {
        git config --global remote-hg.hg-git-compat true
        git config --global remote-hg.track-branches false
 
        git config --global remote-hg.hg-git-compat true
        git config --global remote-hg.track-branches false
 

-       HGEDITOR=/usr/bin/true
+       HGEDITOR=true
+       HGMERGE=true

 
        GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
        GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 
        GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
        GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"

-       export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
+       export HGEDITOR HGMERGE GIT_AUTHOR_DATE GIT_COMMITTER_DATE

 }
 
 setup
 }
 
 setup


@@ -198,7 +199,7 @@ test_expect_success 'merge conflict 1' '
        echo C > afile &&
        hg ci -m "A->C" &&
 
        echo C > afile &&
        hg ci -m "A->C" &&
 

-       hg merge -r1 || true &&
+       hg merge -r1 &&

        echo C > afile &&
        hg resolve -m afile &&
        hg ci -m "merge to C"
        echo C > afile &&
        hg resolve -m afile &&
        hg ci -m "merge to C"