remote-hg: trivial test cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 11, 2013 at 07:23 UTC
71c6c95c310b0389f07fdbe40db6f068c1fa95a5
2 files changed
+3
-5
contrib/remote-helpers/test-hg-bidi.sh
+2
-3
@@ -22,7 +22,6 @@ fi
22
23
# clone to a git repo
24
git_clone () {
25
- hg -R $1 bookmark -f -r tip master &&
25
git clone -q "hg::$PWD/$1" $2
26
}
27
@@ -201,8 +200,8 @@ test_expect_success 'hg branch' '
200
hg_push hgrepo gitrepo &&
201
hg_clone gitrepo hgrepo2 &&
202
204
- : TODO, avoid "master" bookmark &&
205
- (cd hgrepo2 && hg checkout gamma) &&
203
+ : Back to the common revision &&
204
+ (cd hgrepo && hg checkout default) &&
205
206
hg_log hgrepo > expected &&
207
hg_log hgrepo2 > actual &&
contrib/remote-helpers/test-hg-hg-git.sh
+1
-2
@@ -27,7 +27,6 @@ fi
27
28
# clone to a git repo with git
29
git_clone_git () {
30
- hg -R $1 bookmark -f -r tip master &&
30
git clone -q "hg::$PWD/$1" $2
31
}
32
@@ -48,7 +47,7 @@ git_clone_hg () {
47
(
48
git init -q $2 &&
49
cd $1 &&
51
- hg bookmark -f -r tip master &&
50
+ hg bookmark -i -f -r tip master &&
51
hg -q push -r master ../$2 || true
52
)
53
}