Re: Hidden Commits in 4.3

2017-04-20 Thread Augie Fackler
(So it’s not buried: Pierre-yves, I’d like to grab a 30 minute VC to get a summary of your thoughts on this, since I know you’ve spent a lot of time on this, assuming you can make time Friday (the 21st).) > On Apr 20, 2017, at 7:37 PM, Sean Farley wrote: > >>> In my example

Re: [PATCH RFC] tests: remaining Windows failures

2017-04-20 Thread Matt Harbison
On Thu, 20 Apr 2017 10:42:50 -0400, Jun Wu wrote: Excerpts from Matt Harbison's message of 2017-04-19 23:04:17 -0400: [...] diff --git a/tests/test-worker.t b/tests/test-worker.t --- a/tests/test-worker.t +++ b/tests/test-worker.t @@ -81,7 +81,6 @@ $ hg --config

Re: [PATCH 2 of 2 STABLE] test-worker: disable tests of forked workers on Windows

2017-04-20 Thread Matt Harbison
On Thu, 20 Apr 2017 11:09:41 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1492696288 -32400 # Thu Apr 20 22:51:28 2017 +0900 # Branch stable # Node ID 9ca22928766f4bafd8adb4f9a49625ca69a48c44 # Parent

[PATCH STABLE] histedit: make check for unresolved conflicts explicit (issue5545)

2017-04-20 Thread Siddharth Agarwal
# HG changeset patch # User Siddharth Agarwal # Date 1492733888 25200 # Thu Apr 20 17:18:08 2017 -0700 # Node ID f368dbe9671ece414c842f164269e893521e3e5d # Parent ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd histedit: make check for unresolved conflicts explicit (issue5545)

Re: Hidden Commits in 4.3

2017-04-20 Thread Sean Farley
Durham Goode writes: > I respond below, but I believe Jun has sent you a innovative proposal > that may solve both of our needs and render this discussion irrelevant. > So take a look at his proposal at your earliest convenience, since it > may let us put this behind us. > > On

[Bug 5544] New: subrepo lost config options

2017-04-20 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5544 Bug ID: 5544 Summary: subrepo lost config options Product: Mercurial Version: default branch Hardware: All OS: All Status: UNCONFIRMED Severity: bug

Re: [PATCH evolve-ext] legacy: fix debugrecordpruneparents to call obsstore.create() with keywords

2017-04-20 Thread Sean Farley
Yuya Nishihara writes: > # HG changeset patch > # User Yuya Nishihara > # Date 1492615273 -32400 > # Thu Apr 20 00:21:13 2017 +0900 > # Branch stable > # Node ID dfc33a94e1e6050d82d6df47b2cffb997f37cbd5 > # Parent eb47d436cdc3bc6657d89baffe24fcd9abaf9e9c >

Re: [PATCH 2 of 2] show: add basic labels to work template

2017-04-20 Thread Sean Farley
Gregory Szorc writes: > # HG changeset patch > # User Gregory Szorc > # Date 1492539008 25200 > # Tue Apr 18 11:10:08 2017 -0700 > # Node ID 7f5f78179f5f6afc0f4bea52aa03f1431e03d3d9 > # Parent d8d4b4acc68859f90f8759309803b116b67a9371 >

Re: [PATCH STABLE] discovery: prevent crash caused by prune marker having no parent data

2017-04-20 Thread Sean Farley
Pierre-Yves David writes: > On 04/19/2017 04:45 PM, Yuya Nishihara wrote: >> # HG changeset patch >> # User Yuya Nishihara >> # Date 1492611005 -32400 >> # Wed Apr 19 23:10:05 2017 +0900 >> # Branch stable >> # Node ID

[PATCH 1 of 2 STABLE] worker: be silent if killed by the main process

2017-04-20 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1492704007 25200 # Thu Apr 20 09:00:07 2017 -0700 # Node ID f0bd43ca0d5659a1e49bf4948a9d3d0f30a69e34 # Parent 59afb0750aecaff6c2b2e4edaab04eb91eca8a88 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 2 of 2 STABLE] test-worker: disable tests of forked workers on Windows

2017-04-20 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1492696288 -32400 # Thu Apr 20 22:51:28 2017 +0900 # Branch stable # Node ID 9ca22928766f4bafd8adb4f9a49625ca69a48c44 # Parent 86688d9fb4bcec3f4672aea9f2f94f5dd9af61c0 test-worker: disable tests of forked workers on Windows

[PATCH 1 of 2 STABLE] test-profile: allow negative time in JSON output (issue5542)

2017-04-20 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1492695945 -32400 # Thu Apr 20 22:45:45 2017 +0900 # Branch stable # Node ID 86688d9fb4bcec3f4672aea9f2f94f5dd9af61c0 # Parent 59afb0750aecaff6c2b2e4edaab04eb91eca8a88 test-profile: allow negative time in JSON output

Re: [PATCH RFC] tests: remaining Windows failures

2017-04-20 Thread Jun Wu
Excerpts from Matt Harbison's message of 2017-04-19 23:04:17 -0400: > [...] > diff --git a/tests/test-worker.t b/tests/test-worker.t > --- a/tests/test-worker.t > +++ b/tests/test-worker.t > @@ -81,7 +81,6 @@ >$ hg --config "extensions.t=$abspath" --config 'worker.numcpus=2' \ >> test

Re: stable ordering of test output

2017-04-20 Thread Yuya Nishihara
On Wed, 19 Apr 2017 15:22:42 -0400, Augie Fackler wrote: > On Sat, Apr 15, 2017 at 1:04 PM, Augie Fackler wrote: > > > >> On Apr 15, 2017, at 5:48 AM, Yuya Nishihara wrote: > >> > >> On Thu, 13 Apr 2017 16:17:34 -0400, Augie Fackler wrote: > >>> # HG changeset

Re: [PATCH remotenames-ext] push: better job checking for git or svn path

2017-04-20 Thread Sean Farley
Ryan McElroy writes: > # HG changeset patch > # User Ryan McElroy > # Date 1492609910 25200 > # Wed Apr 19 06:51:50 2017 -0700 > # Node ID 3fbe113a35b8686b08d5288f8be8ace9ef9a > # Parent e3d4101c550fbbcc5089109f078be905b9d729de > push: better job checking