remote-hg: add test for bookmark diverge
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 24, 2013 at 21:29 UTC
747b61c6a66b5af279fdc1f919e9519045ed097a
1 file changed
+29
contrib/remote-helpers/test-hg.sh
+29
@@ -341,4 +341,33 @@ test_expect_failure 'remote push diverged' '
341
check_branch hgrepo default bump
342
'
343
344
+test_expect_failure 'remote update bookmark diverge' '
345
+ test_when_finished "rm -rf gitrepo*" &&
346
+
347
+ (
348
+ cd hgrepo &&
349
+ hg checkout tip^ &&
350
+ hg bookmark diverge
351
+ ) &&
352
+
353
+ git clone "hg::hgrepo" gitrepo &&
354
+
355
+ (
356
+ cd hgrepo &&
357
+ echo "bump bookmark" > content &&
358
+ hg commit -m "bump bookmark"
359
+ ) &&
360
+
361
+ (
362
+ cd gitrepo &&
363
+ git checkout --quiet diverge &&
364
+ echo diverge > content &&
365
+ git commit -a -m diverge &&
366
+ test_expect_code 1 git push 2> error &&
367
+ grep "^ ! \[rejected\] *diverge -> diverge (non-fast-forward)$" error
368
+ ) &&
369
+
370
+ check_bookmark hgrepo diverge "bump bookmark"
371
+'
372
+
373
test_done