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>
Felipe Contreras committed
May 17, 2013 at 16:10 UTC
0c27c12d21c6af3163ac4253c815e62c6bdd37f3
1 file changed
+4
-3
contrib/remote-helpers/test-hg-hg-git.sh
+4
-3
@@ -104,11 +104,12 @@ setup () {
104
git config --global remote-hg.hg-git-compat true
105
git config --global remote-hg.track-branches false
106
107
- HGEDITOR=/usr/bin/true
107
+ HGEDITOR=true
108
+ HGMERGE=true
109
110
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
111
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
111
- export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
112
+ export HGEDITOR HGMERGE GIT_AUTHOR_DATE GIT_COMMITTER_DATE
113
}
114
115
setup
@@ -198,7 +199,7 @@ test_expect_success 'merge conflict 1' '
199
echo C > afile &&
200
hg ci -m "A->C" &&
201
201
- hg merge -r1 || true &&
202
+ hg merge -r1 &&
203
echo C > afile &&
204
hg resolve -m afile &&
205
hg ci -m "merge to C"