emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Repairing the elpa branch


From: Stefan Monnier
Subject: Re: Repairing the elpa branch
Date: Mon, 14 Jan 2013 23:05:13 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

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

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.


        Stefan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]