Patchwork [V2] selectivepull: fix tests

login
register
mail settings
Submitter Stanislau Hlebik
Date May 31, 2017, 4:12 p.m.
Message ID <8728c97e46330e67bcf5.1496247142@devvm1840.lla2.facebook.com>
Download mbox | patch
Permalink /patch/21090/
State Accepted
Headers show

Comments

Stanislau Hlebik - May 31, 2017, 4:12 p.m.
# HG changeset patch
# User Stanislau Hlebik <stash@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.
Sean Farley - June 1, 2017, 4 a.m.
Stanislau Hlebik <stash@fb.com> writes:

> # HG changeset patch
> # User Stanislau Hlebik <stash@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.

I think silencing the error here is hiding the problem that remotenames
should be overriding the 'checkconflict' method ... but when I tried to
monkey patch that I realized everything is a closure.

I've queued this so that we can move forward but will probably try to
refactor some bookmark code upstream.

Long story even longer, queued; thanks!

Patch

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