[PATCH] convert: filemap must preserve fast-forward merges (issue3340)

[Patrick Mézard]

Le 28/05/12 03:10, Kevin Bullock a écrit :
> On 27 May 2012, at 1:58 PM, Patrick Mezard wrote:
> 
>> # HG changeset patch
>> # User Patrick Mezard <patrick at mezard.eu>
>> # Date 1338141206 -7200
>> # Branch stable
>> # Node ID db0660915e353f8a87ed11fb87660a794c0bab45
>> # Parent  30e46d7138de0acb2d811162c1cf3441afe1687e
>> convert: filemap must preserve fast-forward merges (issue3340)
>>
>> When running convert with a filemap, revisions which changes were
>> filtered out and not closing branch were discarded. Unfortunately, this
>> also discards fast-forward merges between named branches, which are
>> fairly important, especially for head revisions.
> 
> It appears you mean "merges between a changeset and its ancestor that are on different named branches". While it likely doesn't affect the correctness of your patch, those aren't fast-forward merges. Actually they're the _opposite_ of fast-forward merges: to get such a DAG in Git, which of course invented the confusing term, you need the --no-fast-forward option.
> 
> Yet another example why the term "fast-forward merge" is confusing and should be avoided.

Maybe. I am more concerned by the fact I am not sure this should be the default, or should be configurable or anything. Apparently, it helped on guy on IRC. I can resend replacing "fast-forward" with "empty merge" once we know what we want to do with this patch.

--
Patrick Mézard