[PATCH 2 of 6] filemerge: turn filemerge into a generator

[Pierre-Yves David]

On 10/11/2015 09:38 AM, Matt Mackall wrote:
> On Fri, 2015-10-09 at 11:46 -0700, Siddharth Agarwal wrote:
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0 at fb.com>
>> # Date 1444371736 25200
>> #      Thu Oct 08 23:22:16 2015 -0700
>> # Node ID 66ed0fddfd25ea6070c578d0c58e4d198e9236d1
>> # Parent  f32ecec8697102c6daeda1f3a98711a8305f928d
>> filemerge: turn filemerge into a generator
>
>> As described in the previous patch, we separate out premerge and merge into
>> separate steps.
>
> Recently there was a BTS discussion about aborting huge merges[1].
 > [1] Which apparently only like two people read and I can't even find
 > now, which is why you should never use the BTS for design discussion.

https://bz.mercurial-scm.org/show_bug.cgi?id=4841

Here it is. Found it searching for "conflict" I'm adding "merge" to the 
title for good measure.

BTS might not be a great place for slow paced design discussion, but 
I've not found better the mailing list if much more noisy and finding 
old discussion there is a nightmare.

-- 
Pierre-Yves David