Re: Repairing the elpa branch

[Eli Zaretskii]

> From: Glenn Morris <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Mon, 14 Jan 2013 12:28:51 -0500
> 
> Eli Zaretskii wrote:
> 
> > Then I suggest that you use the fast-import method, as it will take
> > much less time and effort (20 sec overall, on my machine).
> 
> Well, I scripted my method, so the time&effort is already spent. :)
> (I also think it's not error-prone, since I diffed the final working
> trees and the bzr logs and saw only expected differences.)

OK, then feel free to do what you think is better.

> > I also think it's much less error-prone, and it retains the merges
> > that Stefan wanted to preserve.
> 
> I know nothing about what fast-import does

bzr-export exports all the history in a portable format, so that you
could import foreign repositories (like from git to bzr or vice
versa).  Then bzr-import creates a new branch from that info.

> Does it preserve all the log info?

Yes.  In fact, I just diff'ed "bzr log --long" results between the
original and the new branch, and the difference I see are because the
"branch nick" changed.  There are only 4 non-trivial changes in the
log messages, where fast-import loses some information, see below:

 revno: 324
-fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13221
 committer: Stefan Monnier <address@hidden>
-branch nick: elpa
+branch nick: trunk
 timestamp: Wed 2012-12-19 14:14:47 +0000
 message:
   * memory-usage: Bump version, belatedly.
@@ -432,9 +431,8 @@
   * Debbugs.wsdl (search_estRequest): Remove superfluous arguments.
 ------------------------------------------------------------
 revno: 286
-fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12749
 committer: Stefan Monnier <address@hidden>
-branch nick: elpa
+branch nick: trunk
 timestamp: Sun 2012-10-28 19:13:01 +0000
 message:
   * num3-mode.el: Fix footer.  Reported by Jonas Bernoulli <address@hidden>.
@@ -2259,9 +2411,9 @@
   Add address@hidden as the maintainer of register-alist.el and windresize.el
 ------------------------------------------------------------
 revno: 256
-author: Michal Nazarewicz <address@hidden>, Felix Lee <address@hidden>
+author: Michal Nazarewicz <address@hidden>
 committer: Stefan Monnier <address@hidden>
-branch nick: elpa
+branch nick: trunk
 timestamp: Wed 2012-09-26 19:54:55 +0000
 message:
   Add num3-mode
@@ -4454,9 +4868,9 @@
   Allow "nomail" to mean no mail is to be forwarded.
 ------------------------------------------------------------
 revno: 214
-author: Jonathan Kotta <address@hidden>  (tiny change)
+author: Jonathan Kotta <address@hidden>
 committer: Stefan Monnier <address@hidden>
-branch nick: elpa
+branch nick: trunk
 timestamp: Mon 2012-05-21 04:46:36 +0000
 message:
   Add adaptive-wrap-extra-indent.