Patchwork test-bookmarks-pushpull: stabilize for Windows

login
register
mail settings
Submitter Matt Harbison
Date Feb. 1, 2018, 4:30 a.m.
Message ID <844666bf1f9e995e47f3.1517459402@Envy>
Download mbox | patch
Permalink /patch/27100/
State Accepted
Headers show

Comments

Matt Harbison - Feb. 1, 2018, 4:30 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1517457704 18000
#      Wed Jan 31 23:01:44 2018 -0500
# Branch stable
# Node ID 844666bf1f9e995e47f38a72fd7ad69a83601628
# Parent  1cb013a6f74e22a1867962bdd9a810c787dd4944
test-bookmarks-pushpull: stabilize for Windows
Yuya Nishihara - Feb. 1, 2018, 11:57 a.m.
On Wed, 31 Jan 2018 23:30:02 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1517457704 18000
> #      Wed Jan 31 23:01:44 2018 -0500
> # Branch stable
> # Node ID 844666bf1f9e995e47f38a72fd7ad69a83601628
> # Parent  1cb013a6f74e22a1867962bdd9a810c787dd4944
> test-bookmarks-pushpull: stabilize for Windows

Queued for stable, thanks.

Patch

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -1202,9 +1202,13 @@ 
 
 Forbid bookmark move on the server
 
+  $ cat << EOF >> $TESTDIR/no-bm-move.sh
+  > #!/bin/sh
+  > echo \$HG_NAMESPACE | grep -v bookmarks
+  > EOF
   $ cat << EOF >> server/.hg/hgrc
   > [hooks]
-  > prepushkey.no-bm-move= echo \$HG_NAMESPACE | grep -v bookmarks
+  > prepushkey.no-bm-move= sh $TESTDIR/no-bm-move.sh
   > EOF
 
 pushing changeset is okay