Re: Repairing the elpa branch

[Stefan Monnier]

>> And the r170 merge is not special, IIUC. 
> Oh, I thought it was because it came from bzr-git, or bzr join, or
> something?

Yes (it's actually a bzr join of a bzr-git branch), but most of the
other merges do as well.

>> It was just the first such merges, so if you replace it with a flat
>> commit, the next merge will turn into the source of the problem.
> Then it seems pointless for me to try and copy the merges?
> But r10, 28, 33, 76 were also merges...

IIUC these are "normal merges" of Bzr branches of elpa (and AFAIK these
branches were very short lived and we don't need to keep track of that
merge metadata for future merges).


        Stefan