[PATCH remotenames-ext] selectivepull: fix tests

Stanislau Hlebik stash at fb.com
Fri May 26 16:12:46 UTC 2017


# HG changeset patch
# User Stanislau Hlebik <stash at fb.com>
# Date 1495731588 25200
#      Thu May 25 09:59:48 2017 -0700
# Node ID 78c8966c02759755235a6566e0c557b82ff9cb0a
# Parent  900f1c70436bd7a266f64a6db592af602f8138a5
selectivepull: fix tests

diff --git a/tests/test-selective-pull.t b/tests/test-selective-pull.t
--- a/tests/test-selective-pull.t
+++ b/tests/test-selective-pull.t
@@ -100,7 +100,7 @@
   $ hg clone -q ssh://user@dummy/remoterepo secondremoterepo
   $ cd secondremoterepo
   $ hg up -q 0238718db2b1
-  $ hg book master
+  $ hg book master --force
   $ cd ..
 
 Add second remote repo path in localrepo
@@ -119,7 +119,7 @@
 
 Move bookmark in second remote, pull and make sure it doesn't move in local repo
   $ cd ../secondremoterepo
-  $ hg book secondbook
+  $ hg book secondbook --force
   $ echo aaa >> a
   $ hg commit -m 'Move bookmark in second remote'
   $ cd ../localrepo


More information about the Mercurial-devel mailing list