diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-17 21:10:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-21 18:59:48 (GMT) |
| commit | 0c27c12d21c6af3163ac4253c815e62c6bdd37f3 (patch) | |
| tree | 01ef38f430a50ad7b09245e3aa0031e9ca541252 /contrib/remote-helpers/test-hg-hg-git.sh | |
| parent | 02a607260fdbaed7717935df68fb76b1a6e577c0 (diff) | |
| download | git-0c27c12d21c6af3163ac4253c815e62c6bdd37f3.zip git-0c27c12d21c6af3163ac4253c815e62c6bdd37f3.tar.gz git-0c27c12d21c6af3163ac4253c815e62c6bdd37f3.tar.bz2 | |
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>
Diffstat (limited to 'contrib/remote-helpers/test-hg-hg-git.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-hg-hg-git.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 1a212b8..e0dbebf 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" |