[PATCH V2] selectivepull: fix tests
Stanislau Hlebik
stash at fb.com
Wed May 31 16:12:22 UTC 2017
# HG changeset patch
# User Stanislau Hlebik <stash at fb.com>
# Date 1496247075 25200
# Wed May 31 09:11:15 2017 -0700
# Node ID 8728c97e46330e67bcf5237686d3078c9eb83d03
# Parent 900f1c70436bd7a266f64a6db592af602f8138a5
selectivepull: fix tests
There was a change upstream bce5ebe728594150db39a8e1744b217bb62862c0 that
added a warning. --force makes this warning go away.
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