[PATCH evolve-ext] fold: add argument to handle ambiguous case

Laurent Charignon lcharignon at fb.com
Fri Jun 12 15:25:59 CDT 2015


Looks like everyone agrees on the following:
- When specifying one commit 'x', we error out and recommend doing  `.~x`
- --exact becomes the default behavior

If nobody feels strongly against that, I will send a V3.

> On Jun 9, 2015, at 1:22 PM, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
> 
> 
> 
> On 06/09/2015 01:20 PM, Matt Mackall wrote:
>> On Tue, 2015-06-09 at 12:58 -0700, Pierre-Yves David wrote:
>>> On 06/08/2015 05:08 PM, Pierre-Yves David wrote:
>>>> I would be pretty unhappy to expose random user to X::Y recommendation
>>>> because they will screw it up a X:Y and get burned down. So the idea of
>>>> X+. is also interesting (but won't work for a full stack).
>> 
>> Do we allow folding non-linearly-related changesets?
> 
> This is unsupported yet (because this requires in memory rebasing, that we do not support yet).
> 
> I think we will want a way to support such folding (the same as we support non linear set in rebase).
> 
> -- 
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list