Re: State of the repository conversion

[David Kastrup]

Eli Zaretskii <address@hidden> writes:

>> From: Stefan <address@hidden>
>> Cc: Steinar Bang <address@hidden>,  address@hidden
>> Date: Fri, 21 Mar 2014 08:40:45 -0400
>> 
>> > What bzrmerge.el does, when we merge a fix from the branch, is
>> > effectively a cherry-pick,
>> 
>> No, bzrmerge does not cherry pick in any sense of the word.  It does
>> a merge.
>
> For crying out loud, Stefan, give me the benefit of the doubt that I
> just _might_ know this!
>
> I said "_effectively_ a cherry-pick".
>
>> > I'm not sure this will work with git, btw.
>> 
>> There's nothing special in bzrmerge that should prevent it from working
>> in another VCS, so long as that VCS has a notion of "branch merge", 
>> basically.
>
> In some ancient discussion Linus said that a commit that doesn't bring
> in any diffs is "madness" and shouldn't exist.  Or maybe I
> misunderstood.

You probably misunderstood.  A merge commit introduces a change in
topology.  There are even explicit merge strategies "theirs" and "ours"
that lead to a merge commit having a work tree matching one of its
parents.

-- 
David Kastrup