D932: filemerge: introduce functions to halt merge flow

martinvonz added inline comments. INLINE COMMENTS > filemerge.py:755-756 > +if action == 'prompt': > +msg = _('continue merge operation (yn)?' '$$ $$ ') > +if ui.promptchoice(msg, 0) == 1: > +_haltmerge() nit: Is the default used only with non-interactive ui? If

mercurial@34795: 15 new changesets

15 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/fe987d0b9e1e changeset: 34781:fe987d0b9e1e user:Pulkit Goyal <7895pul...@gmail.com> date:Wed Sep 20 04:47:43 2017 +0530 summary: registrar: add support for storing the type of command in func object

Re: [PATCH 3 of 4 V2] phase: add a dedicated txnclose-phase hook

On Wed, 2017-10-18 at 10:51 -0500, Kevin Bullock wrote: > > On Oct 14, 2017, at 10:46, Boris Feld > > wrote: > > > > # HG changeset patch > > # User Boris Feld > > # Date 1507477846 -7200 > > #  Sun Oct 08 17:50:46 2017 +0200 > > # Node ID

D1187: registrar: move "constant" possiblecmdtypes to class level

martinvonz added a comment. In https://phab.mercurial-scm.org/D1187#20013, @lothiraldan wrote: > Typo in the commit message `swithc` Done REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1187 To: martinvonz, #hg-reviewers, quark, lothiraldan Cc:

mercurial@34815: 20 new changesets

20 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ed91846c29cf changeset: 34796:ed91846c29cf user:Ryan McElroy date:Fri Oct 06 06:48:43 2017 -0700 summary: filemerge: introduce functions to halt merge flow

D1187: registrar: move "constant" possiblecmdtypes to class level

lothiraldan requested changes to this revision. lothiraldan added a comment. This revision now requires changes to proceed. Typo in the commit message `swithc` REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1187 To: martinvonz, #hg-reviewers, quark, lothiraldan

[PATCH V2] sparse-read: ignore trailing empty revs in each read chunk

# HG changeset patch # User Paul Morelle # Date 1508333299 -7200 # Wed Oct 18 15:28:19 2017 +0200 # Node ID ef3d9978b7daf5c2152f624b10fffb13425b06db # Parent fb2574bd73a9c0d9a7a88407b20fdabc9213bc20 # EXP-Topic optimized-read # Available At

Re: [PATCH 3 of 4 V2] phase: add a dedicated txnclose-phase hook

On Thu, 2017-10-19 at 08:57 +0200, Boris Feld wrote: > On Wed, 2017-10-18 at 10:51 -0500, Kevin Bullock wrote: > > > On Oct 14, 2017, at 10:46, Boris Feld > > > wrote: > > > > > > # HG changeset patch > > > # User Boris Feld > > > # Date

D1187: registrar: move "constant" possiblecmdtypes to class level

lothiraldan accepted this revision. lothiraldan added a comment. Looks good to me now REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1187 To: martinvonz, #hg-reviewers, quark, lothiraldan Cc: lothiraldan, mercurial-devel

D1189: obsfate: rename obsfate into obsolete in changeset_printer

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Yuja's comment on the original obsfate about how we would translate obsfate and the recent discussions about exposing users to new concepts and names lead

D1190: obsfate: rename obsfate into obsolete in default mapfile

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Like the previous patch, replace obsfate by obsolete in default mapfile. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1190

D1191: obsfate: makes successorsetverb takes the markers as argument

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Right now, successorsetverb only needs successors to compute the verb. But we will want use additional information (effect-flags and operation) in the near

[PATCH] phases: bring phase index information back into the hook data

# HG changeset patch # User Boris Feld # Date 1508406933 -7200 # Thu Oct 19 11:55:33 2017 +0200 # Node ID 667730ee4a87977f86b22cf0d66f959990753fdb # Parent 315e04247750ad4983d648d3ba002eb328624b70 # EXP-Topic fix-phase-hooks # Available At

[PATCH] build: build deb/rpm independently on config/extensions in the host system

# HG changeset patch # User muxator # Date 1508273168 -7200 # Tue Oct 17 22:46:08 2017 +0200 # Node ID 08cf9bb1776828f6b4fca94bc3252e1b195ecf48 # Parent 7d51a7792f52c392a7f6887d43198930c66c88be build: build deb/rpm independently on config/extensions in the host system

D1191: obsfate: makes successorsetverb takes the markers as argument

lothiraldan added inline comments. INLINE COMMENTS > krbullock wrote in templater.py:1011 > Needs an update to the `@templatefunc(...)` decoration above too. Done REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1191 To: lothiraldan, #hg-reviewers, krbullock Cc:

D1191: obsfate: makes successorsetverb takes the markers as argument

lothiraldan updated this revision to Diff 3042. lothiraldan marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1191?vs=3027=3042 REVISION DETAIL https://phab.mercurial-scm.org/D1191 AFFECTED FILES mercurial/obsutil.py

D932: filemerge: introduce functions to halt merge flow

krbullock added a subscriber: yuja. krbullock added inline comments. INLINE COMMENTS > ryanmce wrote in filemerge.py:755-756 > I followed the pattern seen elsewhere in this file. > > If you just hit enter, you do get the default, though. > > I can follow-up with a patch to fix all of these

Re: [PATCH] build: build deb/rpm independently on config/extensions in the host system

Bad hash in the commit message, sorry. "b38dfb255867" should become"5aac617a028d". Will send another patch. On 10/19/2017 08:38 PM, muxator wrote: # HG changeset patch # User muxator # Date 1508273168 -7200 # Tue Oct 17 22:46:08 2017 +0200 # Node ID

D1173: rebase: add support to output nodechanges

pulkit added inline comments. INLINE COMMENTS > yuja wrote in rebase.py:597 > I'm surprised that the rebase command does have -T and --style > options from the very start. No idea how they would work, though. I am also surprised by this. > yuja wrote in rebase.py:1551 > Needs to wrap dict/list

Code freeze has begun for 4.4

The code freeze rules now apply: http://www.mercurial-scm.org/wiki/TimeBasedReleasePlan#Code_Freeze Committers, please update to stable (or @) today. We haven't cut 4.4-rc yet because of some lingering bugs that Augie, Martin, and I are actively working to fix, but stay tuned. pacem in terris

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

On Wed, Oct 18, 2017 at 5:40 PM, Augie Fackler wrote: > > > On Oct 18, 2017, at 09:18, Boris Feld wrote: > > > > On Tue, 2017-10-17 at 11:27 -0400, Augie Fackler wrote: > >> On Mon, Oct 16, 2017 at 06:53:32PM +0200, Boris Feld wrote: > >>> # HG

D1190: obsfate: rename obsfate into obsolete in default mapfile

This revision was automatically updated to reflect the committed changes. Closed by commit rHGec765a71bd65: obsfate: rename obsfate into obsolete in default mapfile (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1189: obsfate: rename obsfate into obsolete in changeset_printer

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3a3adbcbd3a0: obsfate: rename obsfate into obsolete in changeset_printer (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] build: build deb/rpm independently on config/extensions in the host system

> On Oct 19, 2017, at 13:46, muxator via Mercurial-devel > wrote: > > # HG changeset patch > # User muxator > # Date 1508273168 -7200 > # Tue Oct 17 22:46:08 2017 +0200 > # Node ID 08cf9bb1776828f6b4fca94bc3252e1b195ecf48 > # Parent

D1191: obsfate: makes successorsetverb takes the markers as argument

krbullock added a comment. Deferring this until after 4.4, because the added `markers` argument isn't used yet. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1191 To: lothiraldan, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

[PATCH follow-up] exchange: propagate the subfunctions return

# HG changeset patch # User Boris Feld # Date 1508442614 -7200 # Thu Oct 19 21:50:14 2017 +0200 # Node ID 204165f5fc88a88ad45d5d8de1fd4631efb72166 # Parent cc977ec0b8b9302bd6ad8e3eeacabb2776161492 # EXP-Topic b2.phases.follow-up # Available At

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

> On Oct 19, 2017, at 17:25, Gregory Szorc wrote: > > On Wed, Oct 18, 2017 at 5:40 PM, Augie Fackler wrote: > > > On Oct 18, 2017, at 09:18, Boris Feld wrote: > > > > On Tue, 2017-10-17 at 11:27 -0400, Augie Fackler wrote: >

Re: [PATCH 5 of 5] log: add an assertion about fctx not being None in patch.diff()

> On Oct 19, 2017, at 08:51, Denis Laxalde wrote: > > # HG changeset patch > # User Denis Laxalde > # Date 1508418393 -7200 > # Thu Oct 19 15:06:33 2017 +0200 > # Node ID e2b8b1cb1eaf17739d7af35479b853214daad35d > # Parent

D932: filemerge: introduce functions to halt merge flow

durin42 added a comment. Fixing unclear prompts in freeze is fine with me. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D932 To: ryanmce, #hg-reviewers, krbullock, mbthomas, durin42 Cc: yuja, martinvonz, durin42, krbullock, pulkit, mercurial-devel

[PATCH] build: build deb/rpm independently on config/extensions in the host system

# HG changeset patch # User muxator # Date 1508273168 -7200 # Tue Oct 17 22:46:08 2017 +0200 # Node ID 07645cfeb770cbd45559627843ea995747ac3917 # Parent 7d51a7792f52c392a7f6887d43198930c66c88be build: build deb/rpm independently on config/extensions in the host system

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

On 10/18/17 11:40 AM, Augie Fackler wrote: We would prefer to have it in this cycle. We want all extensions to have their configuration registered to start beginning working on the cool stuff. Closing the loop from an irc conversation: my concern was that there be a transitional release that

mercurial@34879: 58 new changesets

58 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c1e7ce11db9b changeset: 34822:c1e7ce11db9b user:Boris Feld date:Wed Sep 20 19:17:37 2017 +0200 summary: phase: isolate logic to update remote phrase through bundle2 pushkey

D932: filemerge: introduce functions to halt merge flow

ryanmce added inline comments. INLINE COMMENTS > martinvonz wrote in filemerge.py:755-756 > nit: Is the default used only with non-interactive ui? If it also works as a > default that lets the user just press enter to choose Yes, I'd expect the > "yn" to be "Yn" I followed the pattern seen

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

On Thu, Oct 19, 2017 at 1:49 PM, Ryan McElroy wrote: > On 10/18/17 11:40 AM, Augie Fackler wrote: > > We would prefer to have it in this cycle. We want all extensions to > have their configuration registered to start beginning working on the > cool stuff. > > Closing the loop from

mercurial@34899: 20 new changesets

20 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/9e18ab7f7240 changeset: 34880:9e18ab7f7240 user:Boris Feld date:Wed Oct 18 12:53:00 2017 +0200 summary: sparse-read: move from a recursive-based approach to a heap-based one

D1191: obsfate: makes successorsetverb takes the markers as argument

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > templater.py:1011 > """Compute obsfate related information based on successors > (EXPERIMENTAL)""" > -if len(args) != 1: > +if len(args)

D1197: config: also gather effect-flags on experimental.evolution

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc977ec0b8b9: config: also gather effect-flags on experimental.evolution (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH follow-up] exchange: propagate the subfunctions return

> On Oct 19, 2017, at 15:48, Boris Feld wrote: > > # HG changeset patch > # User Boris Feld > # Date 1508442614 -7200 > # Thu Oct 19 21:50:14 2017 +0200 > # Node ID 204165f5fc88a88ad45d5d8de1fd4631efb72166 > # Parent

Re: [PATCH] show: use labelcset() template alias for work (and stack) views

On Thu, Oct 19, 2017 at 4:10 PM, Yuya Nishihara wrote: > On Tue, 17 Oct 2017 21:01:48 +0200, Denis Laxalde wrote: > > # HG changeset patch > > # User Denis Laxalde > > # Date 1508264743 -7200 > > # Tue Oct 17 20:25:43 2017 +0200 > > # Node ID

mercurial@34818: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e2c42f751b06 changeset: 34816:e2c42f751b06 user:Boris Feld date:Wed Oct 11 20:08:02 2017 +0200 summary: phase: filter out non-draft item in "draft root"

mercurial@34821: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/eb6375651974 changeset: 34819:eb6375651974 user:Boris Feld date:Wed Oct 11 18:39:04 2017 +0200 summary: phase: gather remote phase information in a summary object

Re: [PATCH follow-up] obsfate: fix obsfate_printer with empty date list

On Wed, 18 Oct 2017 16:35:02 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1508333931 -7200 > # Wed Oct 18 15:38:51 2017 +0200 > # Node ID 328ec528162a716ef61877de1982860b67973afa > # Parent 962f7df21a73f044d171fee9c237d0c5062ae317 > #

D1195: config: fix default config value for svn.trunk

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Instead of fallbacking on a default in code, declare the right default during configuration registration so the code is slightly cleaner. REPOSITORY rHG

[PATCH 3 of 5] log: disable bare file patterns with --line-range

# HG changeset patch # User Denis Laxalde # Date 1508415169 -7200 # Thu Oct 19 14:12:49 2017 +0200 # Node ID ce22c9db68b10ac17086a4f213b22d3304f09bad # Parent 252117224ee9e8c3ab488575203ed27c292752bd # EXP-Topic followlines-cli log: disable bare file patterns with

[PATCH 2 of 5] log: switch to FROMLINE:TOLINE syntax for -L/--line-range

# HG changeset patch # User Denis Laxalde # Date 1508409446 -7200 # Thu Oct 19 12:37:26 2017 +0200 # Node ID 252117224ee9e8c3ab488575203ed27c292752bd # Parent a5f0f523e960a7aa3ded8dd5d120058bc2a37044 # EXP-Topic followlines-cli log: switch to FROMLINE:TOLINE syntax

[PATCH 1 of 5] log: handle binary files in --line-range patterns

# HG changeset patch # User Denis Laxalde # Date 1508346033 -7200 # Wed Oct 18 19:00:33 2017 +0200 # Node ID a5f0f523e960a7aa3ded8dd5d120058bc2a37044 # Parent 315e04247750ad4983d648d3ba002eb328624b70 # EXP-Topic followlines-cli log: handle binary files in --line-range

[PATCH 5 of 5] log: add an assertion about fctx not being None in patch.diff()

# HG changeset patch # User Denis Laxalde # Date 1508418393 -7200 # Thu Oct 19 15:06:33 2017 +0200 # Node ID e2b8b1cb1eaf17739d7af35479b853214daad35d # Parent d07a2cce2a4826f69cf2a6db12cc6721d95002a2 # EXP-Topic followlines-cli log: add an assertion about fctx not

[PATCH 4 of 5] log: handle removed files with --line-range patterns

# HG changeset patch # User Denis Laxalde # Date 1508417710 -7200 # Thu Oct 19 14:55:10 2017 +0200 # Node ID d07a2cce2a4826f69cf2a6db12cc6721d95002a2 # Parent ce22c9db68b10ac17086a4f213b22d3304f09bad # EXP-Topic followlines-cli log: handle removed files with

Re: [PATCH] show: use labelcset() template alias for work (and stack) views

On Tue, 17 Oct 2017 21:01:48 +0200, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1508264743 -7200 > # Tue Oct 17 20:25:43 2017 +0200 > # Node ID 9af9aa26a601cf26aca9320d0384857fe09fa28b > # Parent 68e0bcb903572cb3641c1b1ac11bdcf47d4ff5ac > #

Re: [PATCH 7 of 8 V2] phase: isolate logic to update remote phrase through bundle2 pushkey

On Mon, 16 Oct 2017 20:23:48 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1505927857 -7200 > # Wed Sep 20 19:17:37 2017 +0200 > # Node ID 9c084f14df72a2d511d414e0ecf50a086c0a2341 > # Parent e688d8b13100c464897c7f872c498202f8e82272 > #

mercurial@34909: 10 new changesets (1 on stable)

10 new changesets (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/3a3adbcbd3a0 changeset: 34900:3a3adbcbd3a0 user:Boris Feld date:Thu Oct 19 12:32:42 2017 +0200 summary: obsfate: rename obsfate into obsolete in changeset_printer

D1198: highlight: hide pygments import error at import time

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Commands like `hg help` has a side effect of loading every extension. If `pygments` is not installed, loading the `highlight` could fail immediately with chg or

Re: [PATCH] phases: bring phase index information back into the hook data

> On Oct 19, 2017, at 05:10, Boris Feld wrote: > > # HG changeset patch > # User Boris Feld > # Date 1508406933 -7200 > # Thu Oct 19 11:55:33 2017 +0200 > # Node ID 667730ee4a87977f86b22cf0d66f959990753fdb > # Parent

D1173: rebase: add support to output nodechanges

yuja added inline comments. INLINE COMMENTS > rebase.py:597 > ('a', 'abort', False, _('abort an interrupted rebase'))] + > templateopts, > _('[-s REV | -b REV] [-d REV] [OPTION]')) I'm surprised that the rebase command does have -T and --style options from the very start. No

D1196: tests: add some (?) output lines to catch "helpful" output from Solaris diff

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1196 AFFECTED FILES tests/test-archive.t CHANGE DETAILS diff --git a/tests/test-archive.t

D1195: config: fix default config value for svn.trunk

lothiraldan abandoned this revision. lothiraldan added a comment. Indeed, the `getcfgpath` function also calls it, my bad. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1195 To: lothiraldan, #hg-reviewers, durin42 Cc: durin42, mercurial-devel

D1188: registrar: don't i18n ProgrammingError message

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3e3e69008623: registrar: dont i18n ProgrammingError message (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1186: tests: de-flake test-run-tests.t's "--jobs=2 --first" test

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe2efb1377340: tests: de-flake test-run-tests.ts --jobs=2 --first test (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1187: registrar: move "constant" possiblecmdtypes to class level

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3ade6ca6e3ed: registrar: move constant possiblecmdtypes to class level (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1184: fsmonitor: use nonnormalset from dirstatemap

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaf61beb79658: fsmonitor: use nonnormalset from dirstatemap (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1184?vs=3014=3035

D1196: tests: add some (?) output lines to catch "helpful" output from Solaris diff

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. LGTM REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1196 To: durin42, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1196: tests: add some (?) output lines to catch "helpful" output from Solaris diff

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb3df7e4cac87: tests: add some (?) output lines to catch helpful output from Solaris diff (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1195: config: fix default config value for svn.trunk

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. That's not the only place it's used. I don't have it in front of me, but look for trunk in other places (it's where svn.tags and svn.branches get used as well). The other

[Bug 5713] New: Performance regression on c36c3fa7

https://bz.mercurial-scm.org/show_bug.cgi?id=5713 Bug ID: 5713 Summary: Performance regression on c36c3fa7 Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Keywords:

[Bug 5714] New: Performance regression on b36881c6

https://bz.mercurial-scm.org/show_bug.cgi?id=5714 Bug ID: 5714 Summary: Performance regression on b36881c6 Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Keywords:

[Bug 5715] New: terse mode isn't working on Windows

https://bz.mercurial-scm.org/show_bug.cgi?id=5715 Bug ID: 5715 Summary: terse mode isn't working on Windows Product: Mercurial Version: default branch Hardware: PC OS: Windows Status: UNCONFIRMED

D1140: localrepo: add a pinnedrevs attribute

krbullock added a comment. We're dropping this stack from 4.4 because it caused unexpected behavior changes in python-hglib (https://buildbot.mercurial-scm.org/builders/python-hglib/builds/654) and elsewhere. Seems to stem from recomputing from the same set on repeated calls to

Re: [PATCH 7 of 8 V2] phase: isolate logic to update remote phrase through bundle2 pushkey

On Thu, 2017-10-19 at 22:30 +0900, Yuya Nishihara wrote: > On Mon, 16 Oct 2017 20:23:48 +0200, Boris Feld wrote: > > # HG changeset patch > > # User Boris Feld > > # Date 1505927857 -7200 > > #  Wed Sep 20 19:17:37 2017 +0200 > > # Node ID

D1197: config: also gather effect-flags on experimental.evolution

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Effect-flags config was in flight while the previous evolve config renaming was written. Now that both landed, gather effect-flags in experimental.evolution

D932: filemerge: introduce functions to halt merge flow

martinvonz added a comment. In https://phab.mercurial-scm.org/D932#20158, @durin42 wrote: > Fixing unclear prompts in freeze is fine with me. +1 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D932 To: ryanmce, #hg-reviewers, krbullock, mbthomas,

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

On Thu, Oct 19, 2017 at 11:26 PM, Augie Fackler wrote: > > > On Oct 19, 2017, at 17:25, Gregory Szorc > wrote: > > > > On Wed, Oct 18, 2017 at 5:40 PM, Augie Fackler wrote: > > > > > On Oct 18, 2017, at 09:18, Boris Feld