Patchwork [remotenames-ext] tests: fix for new upstream behavior

login
register
mail settings
Submitter Ryan McElroy
Date March 4, 2016, 3:48 p.m.
Message ID <32c0d1eeca9d9a597dcd.1457106490@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/13601/
State Accepted
Delegated to: Sean Farley
Headers show

Comments

Ryan McElroy - March 4, 2016, 3:48 p.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1457097073 28800
#      Fri Mar 04 05:11:13 2016 -0800
# Node ID 32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
# Parent  f9b5c42caba3e4a76c1c2ee5ef78f3baf216273b
tests: fix for new upstream behavior

Core hg added rebase destination logic which changed the behavior of `hg rebase`
and `hg pull --rebase`. Update the tests to account for these changes.
Pierre-Yves David - March 9, 2016, 5:27 p.m.
On 03/04/2016 03:48 PM, Ryan McElroy wrote:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy@fb.com>
> # Date 1457097073 28800
> #      Fri Mar 04 05:11:13 2016 -0800
> # Node ID 32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
> # Parent  f9b5c42caba3e4a76c1c2ee5ef78f3baf216273b
> tests: fix for new upstream behavior
>
> Core hg added rebase destination logic which changed the behavior of `hg rebase`
> and `hg pull --rebase`. Update the tests to account for these changes.

Sean, have you seen this?
Sean Farley - March 11, 2016, 10:34 p.m.
Ryan McElroy <rm@fb.com> writes:

> # HG changeset patch
> # User Ryan McElroy <rmcelroy@fb.com>
> # Date 1457097073 28800
> #      Fri Mar 04 05:11:13 2016 -0800
> # Node ID 32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
> # Parent  f9b5c42caba3e4a76c1c2ee5ef78f3baf216273b
> tests: fix for new upstream behavior
>
> Core hg added rebase destination logic which changed the behavior of `hg rebase`
> and `hg pull --rebase`. Update the tests to account for these changes.

This breaks tests with hg 3.7.2 (and before). Should we care about that?
Pierre-Yves David - March 11, 2016, 11:51 p.m.
On 03/11/2016 10:34 PM, Sean Farley wrote:
>
> Ryan McElroy <rm@fb.com> writes:
>
>> # HG changeset patch
>> # User Ryan McElroy <rmcelroy@fb.com>
>> # Date 1457097073 28800
>> #      Fri Mar 04 05:11:13 2016 -0800
>> # Node ID 32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
>> # Parent  f9b5c42caba3e4a76c1c2ee5ef78f3baf216273b
>> tests: fix for new upstream behavior
>>
>> Core hg added rebase destination logic which changed the behavior of `hg rebase`
>> and `hg pull --rebase`. Update the tests to account for these changes.
>
> This breaks tests with hg 3.7.2 (and before). Should we care about that?

For mutable history, I've a default branch (in sync with default) and 
stable branch (in sync with stable) and hg-3.x branch for other version 
I support.

All pass tests with there counterpart.
Sean Farley - March 12, 2016, 12:09 a.m.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> writes:

> On 03/11/2016 10:34 PM, Sean Farley wrote:
>>
>> Ryan McElroy <rm@fb.com> writes:
>>
>>> # HG changeset patch
>>> # User Ryan McElroy <rmcelroy@fb.com>
>>> # Date 1457097073 28800
>>> #      Fri Mar 04 05:11:13 2016 -0800
>>> # Node ID 32c0d1eeca9d9a597dcdb984dfaf17aef93a002e
>>> # Parent  f9b5c42caba3e4a76c1c2ee5ef78f3baf216273b
>>> tests: fix for new upstream behavior
>>>
>>> Core hg added rebase destination logic which changed the behavior of `hg rebase`
>>> and `hg pull --rebase`. Update the tests to account for these changes.
>>
>> This breaks tests with hg 3.7.2 (and before). Should we care about that?
>
> For mutable history, I've a default branch (in sync with default) and 
> stable branch (in sync with stable) and hg-3.x branch for other version 
> I support.
>
> All pass tests with there counterpart.

Fair enough. If we need to backport, we can do that later when needed.
I've queued the patch.

Patch

diff --git a/tests/test-pull-rebase.t b/tests/test-pull-rebase.t
--- a/tests/test-pull-rebase.t
+++ b/tests/test-pull-rebase.t
@@ -77,7 +77,18 @@  Tests 'hg pull --rebase' defaults to ori
   |
   o  root |  |
   
-  $ hg pull --rebase -q
+  $ hg pull --rebase
+  pulling from $TESTTMP/remoterepo (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+2 heads)
+  updating to active bookmark bmnottracking
+  nothing to rebase
+  $ hg rebase -d 3
+  rebasing 1:6a7c7fb59c1e "localcommit" (bmnottracking)
+  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/6a7c7fb59c1e-55f908e9-backup.hg (glob)
   $ printdag
   @  localcommit | bmnottracking |
   |
diff --git a/tests/test-tracking.t b/tests/test-tracking.t
--- a/tests/test-tracking.t
+++ b/tests/test-tracking.t
@@ -194,9 +194,10 @@  Test that tracking isn't over-eager on r
   
   $ hg bookmarks -v
    * c                         5:ff58066d17c3            [remote/a: 1 ahead, 2 behind]
-  $ hg rebase -b .
-  nothing to rebase - ff58066d17c3 is both "base" and destination
-  [1]
+  $ hg rebase -s .
+  abort: no matching bookmark to rebase - please rebase to an explicit rev or bookmark
+  (run 'hg heads' to see all heads)
+  [255]
   $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n'
   @  5 ff58066d17c3 c
   |