kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Felipe Contreras 2013-05-17 16:10:08 -05:00 committed by Junio C Hamano
parent 02a607260f
commit 0c27c12d21
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/remote-helpers/test-hg-hg-git.sh
View File

@ -104,11 +104,12 @@ setup () {
git config --global remote-hg.hg-git-compat true git config --global remote-hg.hg-git-compat true
git config --global remote-hg.track-branches false 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_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" 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 && echo C > afile &&
hg ci -m "A->C" && hg ci -m "A->C" &&


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