Patchwork [2,of,2] setup: add missing hgext.fsmonitor

login
register
mail settings
Submitter Pierre-Yves David
Date March 22, 2016, 11:39 p.m.
Message ID <56F1D79A.1010706@ens-lyon.org>
Download mbox | patch
Permalink /patch/14034/
State Superseded
Commit 776fd2e2cf5a92a9cea9f36003054cee069206f3
Headers show

Comments

Pierre-Yves David - March 22, 2016, 11:39 p.m.
On 03/22/2016 04:17 PM, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1458688082 25200
> #      Tue Mar 22 16:08:02 2016 -0700
> # Node ID c330ac3641660d028c235ad969dd5a7eda1b018c
> # Parent  c11f0992d1246286a6a0b2531ff5f31948abcf58
> # EXP-Topic smf/fix-install
> setup: add missing hgext.fsmonitor
>
> Before this patch, fsmonitor was not installed along with other extensions. It
> did correctly build the C files needed but forgot to copy over the python
> files. This patch fixes it by adding fsmonitor to the correct variable.

Patch two make a test unhappy, can you look into that?


ERROR: test-duplicateoptions.py output changed

patch 1 pushed.
Sean Farley - March 22, 2016, 11:40 p.m.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> writes:

> On 03/22/2016 04:17 PM, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1458688082 25200
>> #      Tue Mar 22 16:08:02 2016 -0700
>> # Node ID c330ac3641660d028c235ad969dd5a7eda1b018c
>> # Parent  c11f0992d1246286a6a0b2531ff5f31948abcf58
>> # EXP-Topic smf/fix-install
>> setup: add missing hgext.fsmonitor
>>
>> Before this patch, fsmonitor was not installed along with other extensions. It
>> did correctly build the C files needed but forgot to copy over the python
>> files. This patch fixes it by adding fsmonitor to the correct variable.
>
> Patch two make a test unhappy, can you look into that?
>
> --- /home/pyd/src/mercurial-dev/tests/test-duplicateoptions.py.out
> +++ /home/pyd/src/mercurial-dev/tests/test-duplicateoptions.py.err
> @@ -0,0 +1 @@
> +*** failed to import extension fsmonitor: No module named fsmonitor
>
> ERROR: test-duplicateoptions.py output changed

Yep, on it.

Patch

--- /home/pyd/src/mercurial-dev/tests/test-duplicateoptions.py.out
+++ /home/pyd/src/mercurial-dev/tests/test-duplicateoptions.py.err
@@ -0,0 +1 @@ 
+*** failed to import extension fsmonitor: No module named fsmonitor