From: Felipe Contreras Date: Fri, 17 May 2013 21:10:08 +0000 (-0500) Subject: remote-hg: tests: fix hg merge X-Git-Tag: v1.8.4-rc0~191^2~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c27c12d21c6af3163ac4253c815e62c6bdd37f3;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 1a212b88b0..e0dbebf050 100755 --- 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 - HGEDITOR=/usr/bin/true + HGEDITOR=true + HGMERGE=true 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 @@ -198,7 +199,7 @@ test_expect_success 'merge conflict 1' ' 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"