[PATCH V2] selectivepull: fix tests

[Sean Farley]

Stanislau Hlebik <stash at fb.com> writes:

> # 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.

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!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170531/811243ed/attachment.sig>