Patchwork [remotenames-ext] selectivepull: fix tests

login
register
mail settings
Submitter Stanislau Hlebik
Date May 26, 2017, 4:12 p.m.
Message ID <78c8966c02759755235a.1495815166@devvm1840.lla2.facebook.com>
Download mbox | patch
Permalink /patch/20931/
State Superseded
Headers show

Comments

Stanislau Hlebik - May 26, 2017, 4:12 p.m.
# HG changeset patch
# User Stanislau Hlebik <stash@fb.com>
# Date 1495731588 25200
#      Thu May 25 09:59:48 2017 -0700
# Node ID 78c8966c02759755235a6566e0c557b82ff9cb0a
# Parent  900f1c70436bd7a266f64a6db592af602f8138a5
selectivepull: fix tests
Sean Farley - May 31, 2017, 12:23 a.m.
Stanislau Hlebik <stash@fb.com> writes:

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

Can you provide a bit more of what's going on? Is this due to Aguie's
change about unambiguous matching?
Stanislau Hlebik - May 31, 2017, 4:10 p.m.
Excerpts from Sean Farley's message of 2017-05-30 17:23:11 -0700:
> Stanislau Hlebik <stash@fb.com> writes:
> 
> > # HG changeset patch
> > # User Stanislau Hlebik <stash@fb.com>
> > # Date 1495731588 25200
> > #      Thu May 25 09:59:48 2017 -0700
> > # Node ID 78c8966c02759755235a6566e0c557b82ff9cb0a
> > # Parent  900f1c70436bd7a266f64a6db592af602f8138a5
> > selectivepull: fix tests
> 
> Can you provide a bit more of what's going on? Is this due to Aguie's
> change about unambiguous matching?

Yes, that's because of this change. I'll send V2 with update message

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