Re: Repairing the elpa branch

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden,  address@hidden
> Date: Tue, 15 Jan 2013 08:39:52 -0500
> 
> >> Yes, you see merges, but they are from rewritten branches (with
> >> different revids), so they're useless when you try to sync up with the
> >> upstream branch because there's no common ancestor any more.
> > This will happen with _any_ rewriting.
> 
> No: not if the rewrite only rewrites the mainline and not the branches.

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