Browse Source

remote-hg: trivial test cleanups

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
71c6c95c31
  1. 5
      contrib/remote-helpers/test-hg-bidi.sh
  2. 3
      contrib/remote-helpers/test-hg-hg-git.sh

5
contrib/remote-helpers/test-hg-bidi.sh

@ -22,7 +22,6 @@ fi @@ -22,7 +22,6 @@ fi

# clone to a git repo
git_clone () {
hg -R $1 bookmark -f -r tip master &&
git clone -q "hg::$PWD/$1" $2
}

@ -201,8 +200,8 @@ test_expect_success 'hg branch' ' @@ -201,8 +200,8 @@ test_expect_success 'hg branch' '
hg_push hgrepo gitrepo &&
hg_clone gitrepo hgrepo2 &&

: TODO, avoid "master" bookmark &&
(cd hgrepo2 && hg checkout gamma) &&
: Back to the common revision &&
(cd hgrepo && hg checkout default) &&

hg_log hgrepo > expected &&
hg_log hgrepo2 > actual &&

3
contrib/remote-helpers/test-hg-hg-git.sh

@ -27,7 +27,6 @@ fi @@ -27,7 +27,6 @@ fi

# clone to a git repo with git
git_clone_git () {
hg -R $1 bookmark -f -r tip master &&
git clone -q "hg::$PWD/$1" $2
}

@ -48,7 +47,7 @@ git_clone_hg () { @@ -48,7 +47,7 @@ git_clone_hg () {
(
git init -q $2 &&
cd $1 &&
hg bookmark -f -r tip master &&
hg bookmark -i -f -r tip master &&
hg -q push -r master ../$2 || true
)
}

Loading…
Cancel
Save