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: The git mirror is *very* badly screwed up Date: Sat, 25 Jan 2014 09:44:35 +0200 Message-ID: <83bnz0cxp8.fsf@gnu.org> 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> <20140125062551.GA2554@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1390635898 8658 80.91.229.3 (25 Jan 2014 07:44:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 25 Jan 2014 07:44:58 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 25 08:45:04 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 1W6xvL-0004qX-O7 for ged-emacs-devel@m.gmane.org; Sat, 25 Jan 2014 08:45:03 +0100 Original-Received: from localhost ([::1]:50203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6xvL-0007Tb-CX for ged-emacs-devel@m.gmane.org; Sat, 25 Jan 2014 02:45:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6xvE-0007SV-LS for emacs-devel@gnu.org; Sat, 25 Jan 2014 02:45:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6xv9-0000sL-LQ for emacs-devel@gnu.org; Sat, 25 Jan 2014 02:44:56 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:60979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6xv9-0000sH-Cq for emacs-devel@gnu.org; Sat, 25 Jan 2014 02:44:51 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0MZY00H004VPOP00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 25 Jan 2014 09:44:49 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZY00HHI5IPL780@a-mtaout23.012.net.il>; Sat, 25 Jan 2014 09:44:49 +0200 (IST) In-reply-to: <20140125062551.GA2554@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:169043 Archived-At: > Date: Sat, 25 Jan 2014 01:25:52 -0500 > From: "Eric S. Raymond" > Cc: schwab@linux-m68k.org, emacs-devel@gnu.org > > 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. Isn't that what I said, too? (I didn't see Andreas's message until after writing mine, so you now have 2 independent opinions that say essentially the same.) > But if elpa has its own repo now, probably it should be trimmed out > on conversion day. What do you mean by "trimmed"? If you mean removed from the repository, then I thought you were converting only select branches anyway, and elpa wasn't one of them. Bazaar repositories are just collections of branches, so converting all of them into a git repo is not necessarily the wisest course of action, to say the least. > 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. I actually don't understand why you are doing a separate new conversion, instead of relying on what Andreas already did. AFAIR, there was no serious discussions of this, and certainly no decision (except, perhaps, by you).