From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Repairing the elpa branch Date: Mon, 14 Jan 2013 19:22:44 +0200 Message-ID: <83libvr863.fsf@gnu.org> References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> <83txqjrcxb.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1358184171 695 80.91.229.3 (14 Jan 2013 17:22:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2013 17:22:51 +0000 (UTC) Cc: cyd@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 14 18:23:08 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TunkT-00086g-Qp for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2013 18:23:01 +0100 Original-Received: from localhost ([::1]:53902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TunkD-000388-Im for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2013 12:22:45 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tunk7-00036U-64 for emacs-devel@gnu.org; Mon, 14 Jan 2013 12:22:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tunk2-0001Ck-NN for emacs-devel@gnu.org; Mon, 14 Jan 2013 12:22:39 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:50001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tunk1-0001CO-DN; Mon, 14 Jan 2013 12:22:33 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MGM00A00LK1JA00@a-mtaout20.012.net.il>; Mon, 14 Jan 2013 19:22:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MGM00AHBLL25470@a-mtaout20.012.net.il>; Mon, 14 Jan 2013 19:22:14 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:156346 Archived-At: > From: Glenn Morris > Cc: Chong Yidong , monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Mon, 14 Jan 2013 12:10:27 -0500 > > Eli Zaretskii wrote: > > > The downside of this is, of course, that all the revision-ids will > > change (the hash part of the revid's displayed by bzr will be > > different), so users will have to abandon their current elpa checkouts > > and clone a new branch, then copy their local commits to the new > > branch. > > This will be an inevitable side-effect of whatever we do (well, all the > revids after r170's anyway), if we do anything. 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). I also think it's much less error-prone, and it retains the merges that Stefan wanted to preserve.