Patchwork [remotenames] tests: adjust for new upstream behavior

login
register
mail settings
Submitter Mateusz Kwapich
Date March 31, 2016, 8:39 p.m.
Message ID <3489e2da8971636cca86.1459456748@dev3277.prn1.facebook.com>
Download mbox | patch
Permalink /patch/14209/
State Accepted
Delegated to: Durham Goode
Headers show

Comments

Mateusz Kwapich - March 31, 2016, 8:39 p.m.
# HG changeset patch
# User Mateusz Kwapich <mitrandir@fb.com>
# Date 1459208377 25200
#      Mon Mar 28 16:39:37 2016 -0700
# Node ID 3489e2da8971636cca86d30c3b0a5414d6c4ee48
# Parent  32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
tests: adjust for new upstream behavior

The "activating..." message is not printed anymore when bookmark is already
active.
Ryan McElroy - April 11, 2016, 4:54 p.m.
On 3/31/2016 9:39 PM, Mateusz Kwapich wrote:
> # HG changeset patch
> # User Mateusz Kwapich <mitrandir@fb.com>
> # Date 1459208377 25200
> #      Mon Mar 28 16:39:37 2016 -0700
> # Node ID 3489e2da8971636cca86d30c3b0a5414d6c4ee48
> # Parent  32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
> tests: adjust for new upstream behavior
>
> The "activating..." message is not printed anymore when bookmark is already
> active.

Thanks, I'll take this upstream now.

>
> diff --git a/tests/test-tracking.t b/tests/test-tracking.t
> --- a/tests/test-tracking.t
> +++ b/tests/test-tracking.t
> @@ -305,7 +305,6 @@ Test bookmarks with difficult characters
>        with	tab too              5:8d13dc14fef1
>     $ hg update bookmark/with/slashes
>     0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  (activating bookmark bookmark/with/slashes)
>     $ hg book -v
>        bookmark with spaces      5:8d13dc14fef1
>      * bookmark/with/slashes     5:8d13dc14fef1            [remote/a: 1 ahead, 0 behind]
>

Patch

diff --git a/tests/test-tracking.t b/tests/test-tracking.t
--- a/tests/test-tracking.t
+++ b/tests/test-tracking.t
@@ -305,7 +305,6 @@  Test bookmarks with difficult characters
      with	tab too              5:8d13dc14fef1
   $ hg update bookmark/with/slashes
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (activating bookmark bookmark/with/slashes)
   $ hg book -v
      bookmark with spaces      5:8d13dc14fef1
    * bookmark/with/slashes     5:8d13dc14fef1            [remote/a: 1 ahead, 0 behind]