[PATCH 4 of 7] destutil: explicitly remove descendants from destmerge candidates

[Pierre-Yves David]

On 02/14/2016 08:05 AM, Martin von Zweigbergk wrote:
> On Sat, Feb 13, 2016 at 6:16 PM, Pierre-Yves David
> <pierre-yves.david at ens-lyon.org> wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at fb.com>
>> # Date 1454951526 -3600
>> #      Mon Feb 08 18:12:06 2016 +0100
>> # Node ID 4cccc4e95970f32885a3e896c668f3e00b11bd45
>> # Parent  b989484b0b89e62846830c0ce20bb567b2d866df
>> # EXP-Topic destination
>> # Available At http://hg.netv6.net/marmoute-wip/mercurial/
>> #              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r 4cccc4e95970
>> destutil: explicitly remove descendants from destmerge candidates
>>
>> While 'hg merge' will refuse to pick a default destination if the working copy
>> is not on a head, this will be a common and valid case for rebase. In this
>> case, we will need to exclude from the candidate destination all descendants
>> from the rebased set.
>>
>> We make a step forward in that direction by removing descendants of the working
>> copy from the candidate destinations instead of manually filtering the working
>> copy parent at the end of the process.
>
> The patch looks like just a refactoring removing the current head from
> set (list) of non-bookmarked branch heads. I don't see anything about
> descendants. Please explain.

While writting commit message I've mixed the change done in this patch 
with the change done in the next one. I'll the dispatch the text and 
send a V2.

Do you want to me include patch 1-3 in this V2 or are they fine by you?

Cheers,

-- 
Pierre-Yves David