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: Tue, 15 Jan 2013 18:26:43 +0200 Message-ID: <83622yqunw.fsf@gnu.org> References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> <83txqjrcxb.fsf@gnu.org> <83d2x7qep0.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1358267191 15760 80.91.229.3 (15 Jan 2013 16:26:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jan 2013 16:26:31 +0000 (UTC) Cc: cyd@gnu.org, schwab@linux-m68k.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 15 17:26:49 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 1Tv9Lc-0005CV-7x for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 17:26:48 +0100 Original-Received: from localhost ([::1]:59634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9LL-0008M9-U2 for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 11:26:31 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:55478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9LI-0008M4-MF for emacs-devel@gnu.org; Tue, 15 Jan 2013 11:26:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9LD-00075i-QA for emacs-devel@gnu.org; Tue, 15 Jan 2013 11:26:28 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:63386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9LB-00074x-RV; Tue, 15 Jan 2013 11:26:22 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MGO00400DLUUK00@a-mtaout22.012.net.il>; Tue, 15 Jan 2013 18:26:10 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MGO00483DNMK180@a-mtaout22.012.net.il>; Tue, 15 Jan 2013 18:26:10 +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.172 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:156388 Archived-At: > From: Stefan Monnier > Cc: Eli Zaretskii , cyd@gnu.org, emacs-devel@gnu.org > Date: Tue, 15 Jan 2013 08:39:52 -0500 > > >> Yes, you see merges, but they are from rewritten branches (with > >> different revids), so they're useless when you try to sync up with the > >> upstream branch because there's no common ancestor any more. > > This will happen with _any_ rewriting. > > No: not if the rewrite only rewrites the mainline and not the branches. But the common ancestors are (usually) on the mainline. So you'd need to keep the mainline rev-ids unaltered as well, no?