From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: The git mirror is *very* badly screwed up Date: Sat, 25 Jan 2014 01:25:52 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140125062551.GA2554@thyrsus.com> References: <20140124162937.8699D38155C@snark.thyrsus.com> <87r47xs552.fsf@igel.home> <20140124170751.GA23376@thyrsus.com> <87mwils3b3.fsf@igel.home> <20140124185429.GA25191@thyrsus.com> <83k3dpcbpe.fsf@gnu.org> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1390631163 32151 80.91.229.3 (25 Jan 2014 06:26:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 25 Jan 2014 06:26:03 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 25 07:26:11 2014 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 1W6wh0-0003Pe-Pq for ged-emacs-devel@m.gmane.org; Sat, 25 Jan 2014 07:26:10 +0100 Original-Received: from localhost ([::1]:50059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6wgy-0005jG-9W for ged-emacs-devel@m.gmane.org; Sat, 25 Jan 2014 01:26:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6wgr-0005jB-Vf for emacs-devel@gnu.org; Sat, 25 Jan 2014 01:26:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6wgn-00058m-P9 for emacs-devel@gnu.org; Sat, 25 Jan 2014 01:26:01 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:38475 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6wgj-00058L-6L; Sat, 25 Jan 2014 01:25:53 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 1C060381933; Sat, 25 Jan 2014 01:25:52 -0500 (EST) Content-Disposition: inline In-Reply-To: <83k3dpcbpe.fsf@gnu.org> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:169038 Archived-At: Eli Zaretskii : > > Four commits following :862 - :864, :867, :869, :871 - form a merge > > bubble which is closed at :873. The problem is that something in the > > chain of transmission gave both sides of the bubble the same branch ID, > > which should not ever happen. > > The commits you cited are from the elpa branch. I don't see why you > should worry about that, since elpa already switched to git anyway. > Its bzr branch is of no use anymore. Andreas says I should do nothing with that branch. But if elpa has its own repo now, probably it should be trimmed out on conversion day. Somebody, definitely not me and probably Stefan, should make a policy decision about that. But nobody needs to decide yet. I have a solid week of work to do, maybe ten days, maybe even two weeks, cleaning up other crap in there. -- Eric S. Raymond