Re: Repairing the elpa branch

[Stephen J. Turnbull]

Stefan Monnier writes:

 > >> 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.

AFAICS, for "recent" branches (including those that have been recently
sync'ed to mainline by merging from mainline), either they get
rewritten, or they get chopped off the mainline.

Reminds me of C. P. Snow's Three Laws of Thermodynamics.