Re: [PATCH 2 of 9] chgserver: add a top-level run method

On Sat, 19 Nov 2016 15:05:55 +, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2016-11-19 18:09:18 +0900: > > I'm in favor of going through dispatch.dispatch() with some special > > treatments > > for chg, but you might be right in that it would be unnecessary complicated. > > So

Re: [PATCH 1 of 5 shelve-ext] shelve: move temporary commit creation to a separate function

On 11/19/16, 10:02 AM, "Yuya Nishihara" wrote: On Sun, 13 Nov 2016 03:39:34 -0800, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1479036952 28800 > # Sun Nov 13 03:35:52

[PATCH] conflicts: make spacing consistent in conflict markers

# HG changeset patch # User Kostia Balytskyi # Date 1479598897 28800 # Sat Nov 19 15:41:37 2016 -0800 # Node ID 5f03a63d6def1cf3c34fa7f8979c34151a9ba660 # Parent 0c3a8b6239db2c0d6a0e9ddea2266445bca2d440 conflicts: make spacing consistent in conflict markers The way default

Re: [PATCH evolve-ext] fold: disallow multiple revisions without --exact

On Fri, 2016-11-04 at 16:58 -0700, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1478303512 25200 > # Fri Nov 04 16:51:52 2016 -0700 > # Node ID bb80851fe9a6e14263f0076074108556377141f9 > # Parent

Re: [PATCH evolve-ext] fold: disallow multiple revisions without --exact

On Fri, Nov 4, 2016 at 6:09 PM, Kyle Lippincott wrote: > > > On Fri, Nov 4, 2016 at 4:58 PM, Martin von Zweigbergk via Mercurial-devel > wrote: >> >> # HG changeset patch >> # User Martin von Zweigbergk >> # Date

Re: [PATCH 3 of 9] chgserve: pre-import extensions

Excerpts from Yuya Nishihara's message of 2016-11-19 18:02:43 +0900: > Can we do this formally (i.e. without function wrapping and private > function calls)? chgserver.py isn't an extension now. Good idea. I'll move the logic to extensions.py ___

Re: [PATCH V2] help: hide command line options marked as "advanced"

Excerpts from Pierre-Yves David's message of 2016-11-19 11:05:25 +0100: > > On 11/02/2016 03:10 AM, Jun Wu wrote: > > Excerpts from Pierre-Yves David's message of 2016-11-02 02:52:36 +0100: > >> > >> On 11/02/2016 12:49 AM, Jun Wu wrote: > >>> Excerpts from Pierre-Yves David's message of

Re: [PATCH V2] help: hide command line options marked as "advanced"

On 11/02/2016 03:10 AM, Jun Wu wrote: Excerpts from Pierre-Yves David's message of 2016-11-02 02:52:36 +0100: On 11/02/2016 12:49 AM, Jun Wu wrote: Excerpts from Pierre-Yves David's message of 2016-11-02 00:41:03 +0100: On 11/01/2016 04:08 PM, Jun Wu wrote: # HG changeset patch # User

Re: [PATCH 5 of 5 shelve-ext] shelve: move unshelve-finishing logic to a separate function

On Sun, 13 Nov 2016 03:39:38 -0800, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1478876487 28800 > # Fri Nov 11 07:01:27 2016 -0800 > # Node ID c34ee36f4e7fe6b04ea1b4e2f032e995fe65d6c5 > # Parent dce4581dcae386c3d3b420911350d176c0423520

Re: [PATCH 2 of 9] chgserver: add a top-level run method

On Sun, 13 Nov 2016 21:55:46 +, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1479070111 0 > # Sun Nov 13 20:48:31 2016 + > # Node ID ca7a76135db4a9b8a90665c8a42013debbdae3b7 > # Parent c04847bc1bf1804cc7d8f5e7c50a653a9526 > chgserver: add a

Re: [PATCH 3 of 9] chgserve: pre-import extensions

On Sun, 13 Nov 2016 21:55:47 +, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1479070477 0 > # Sun Nov 13 20:54:37 2016 + > # Node ID 70611a6b45d51ba4bf560c2cfdb8d94e08a3dc8f > # Parent ca7a76135db4a9b8a90665c8a42013debbdae3b7 > chgserve: pre-import

Re: Checking for conflict before merge

On 11/07/2016 02:48 PM, akos tajti wrote: Hi All, my problem: I have a repository with many forks. The forks are automatically merged to the blessed repo. I need to somehow check if merging a specific fork would introduce conflicts. I came up with this command sequence: * I run this in the