From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Repairing the elpa branch Date: Tue, 15 Jan 2013 12:38:58 -0500 Message-ID: References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> <83txqjrcxb.fsf@gnu.org> <83d2x7qep0.fsf@gnu.org> <83622yqunw.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1358271543 26166 80.91.229.3 (15 Jan 2013 17:39:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jan 2013 17:39:03 +0000 (UTC) Cc: cyd@gnu.org, schwab@linux-m68k.org, Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 15 18:39:20 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 1TvATo-0002LZ-IY for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 18:39:20 +0100 Original-Received: from localhost ([::1]:42726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvATX-0006UO-TH for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 12:39:03 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:44695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvATU-0006Nj-Sx for emacs-devel@gnu.org; Tue, 15 Jan 2013 12:39:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvATT-0004No-U9 for emacs-devel@gnu.org; Tue, 15 Jan 2013 12:39:00 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvATT-0004Nk-Qx for emacs-devel@gnu.org; Tue, 15 Jan 2013 12:38:59 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1TvATS-0000tl-Iv; Tue, 15 Jan 2013 12:38:58 -0500 X-Spook: Panama Jiang Zemin MIT-LL Kosovo $400 million in gold X-Ran: NsO~F?J8@)#M(h%xW/vvYT}_Pik{3!\kf;*|Hg?e1Bgn$3isy0Af^1ulF$M)b1;|39;=Nv X-Hue: red X-Attribution: GM In-Reply-To: <83622yqunw.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 15 Jan 2013 18:26:43 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:156396 Archived-At: Eli Zaretskii wrote: > But the common ancestors are (usually) on the mainline. So you'd need > to keep the mainline rev-ids unaltered as well, no? Who the heck knows how merge works going between a standalone repo and a repo into which it has been `bzr join'ed? Does it just compare revision-ids and say: you seem to have x and y, but not z, so I'll try merging z?