Re: Repairing the elpa branch

[Glenn Morris]

Eli Zaretskii wrote:

> But the common ancestors are (usually) on the mainline.  So you'd need
> to keep the mainline rev-ids unaltered as well, no?

Who the heck knows how merge works going between a standalone repo and a
repo into which it has been `bzr join'ed? Does it just compare
revision-ids and say: you seem to have x and y, but not z, so I'll try
merging z?