summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers/test-hg-bidi.sh
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-11 07:23:02 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-11 10:46:46 -0700
commit71c6c95c310b0389f07fdbe40db6f068c1fa95a5 (patch)
treebed59231468a1a4be18e5df2cc8a742c3066e0f8 /contrib/remote-helpers/test-hg-bidi.sh
parent8120014e2ba0e65748c8a3c1642bed0891be851d (diff)
downloadgit-71c6c95c310b0389f07fdbe40db6f068c1fa95a5.tar.gz
remote-hg: trivial test cleanups
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-bidi.sh')
-rwxr-xr-xcontrib/remote-helpers/test-hg-bidi.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index fe38e49bc1..a3c88f65b4 100755
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -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' '
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 &&