Re: Repairing the elpa branch

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: Chong Yidong <address@hidden>,  Glenn Morris <address@hidden>,  
> address@hidden
> Date: Mon, 14 Jan 2013 20:38:38 -0500
> 
> >> > I think capturing those merges is important.
> >> > subsequent syncs with upstream are made more difficult if you use flat
> >> > commits.
> >> I think it is a matter of picking the lesser of two evils.  Not being
> >> able to check out the branch at all (without a non-obvious workaround)
> >> seems to be much worse problem, compared with a bit of difficulty
> >> syncing with upstream.  Since no one else has come up with a better
> >> solution, maybe we should go with Glenn's.
> > What about the alternative of using the fast-import plugin?  The
> > following works for me with bzr 2.5.1 and 2.6b1:
> 
> This loses the merge info.

How do you mean "loses"?  After doing this, I still see all the merges
seen in the original branch, and as I wrote, "bzr log --include-merged"
looks the same, with 4 exceptions (that have nothing to do with
merges).