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: Fri, 24 Jan 2014 13:54:30 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140124185429.GA25191@thyrsus.com> References: <20140124162937.8699D38155C@snark.thyrsus.com> <87r47xs552.fsf@igel.home> <20140124170751.GA23376@thyrsus.com> <87mwils3b3.fsf@igel.home> 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 1390589679 24966 80.91.229.3 (24 Jan 2014 18:54:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 24 Jan 2014 18:54:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 24 19:54:46 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 1W6ltq-00074X-Mx for ged-emacs-devel@m.gmane.org; Fri, 24 Jan 2014 19:54:42 +0100 Original-Received: from localhost ([::1]:48532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6ltq-0006Ru-0U for ged-emacs-devel@m.gmane.org; Fri, 24 Jan 2014 13:54:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6ltj-0006PJ-Be for emacs-devel@gnu.org; Fri, 24 Jan 2014 13:54:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6ltf-0006B8-6b for emacs-devel@gnu.org; Fri, 24 Jan 2014 13:54:35 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:32877 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6ltf-0006B2-2Q for emacs-devel@gnu.org; Fri, 24 Jan 2014 13:54:31 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 16D5838049A; Fri, 24 Jan 2014 13:54:30 -0500 (EST) Content-Disposition: inline In-Reply-To: <87mwils3b3.fsf@igel.home> 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:169022 Archived-At: Andreas Schwab : > "Eric S. Raymond" writes: > > > Those aren't bzr revisions, they're marks from a git stream dump. > > That's why they are useless. Tell me the git revisions so I can tell > you what went wrong. The parent commit is bcf9acba5a440b6e6d0b9877b23365d3e47765d7 I have visualized the neighborhood of this commit in bubble.png, which is attached along with an event listing. These make clear enough what is going on. 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. I think there are several dozen anomalies like this. > > which I was going to delete anyway. They seem to consist entirely of dummy > > test commits by Glen Morris. > > They also contains rewritten history. History of what? Can you be clearer about what, if anything, you think needs to be salvaged from these? -- Eric S. Raymond