From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Repairing the elpa branch Date: Wed, 16 Jan 2013 00:33:08 +0900 Message-ID: <87pq16796z.fsf@uwakimon.sk.tsukuba.ac.jp> References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> <83txqjrcxb.fsf@gnu.org> <83d2x7qep0.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1358264010 15198 80.91.229.3 (15 Jan 2013 15:33:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jan 2013 15:33:30 +0000 (UTC) Cc: Eli Zaretskii , cyd@gnu.org, Andreas Schwab , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 15 16:33:46 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 1Tv8WF-0002SC-49 for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 16:33:43 +0100 Original-Received: from localhost ([::1]:40754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv8Vy-0000e9-QX for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 10:33:26 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:41820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv8Vv-0000dq-Sp for emacs-devel@gnu.org; Tue, 15 Jan 2013 10:33:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv8Vu-000094-Ln for emacs-devel@gnu.org; Tue, 15 Jan 2013 10:33:23 -0500 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:33503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv8Vq-00005G-8M; Tue, 15 Jan 2013 10:33:18 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id 8D6289707A5; Wed, 16 Jan 2013 00:33:08 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 28D1C11F0B6; Wed, 16 Jan 2013 00:33:08 +0900 (JST) In-Reply-To: X-Mailer: VM undefined under 21.5 (beta32) "habanero" b0d40183ac79 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 130.158.97.224 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:156383 Archived-At: Stefan Monnier writes: > >> 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. AFAICS, for "recent" branches (including those that have been recently sync'ed to mainline by merging from mainline), either they get rewritten, or they get chopped off the mainline. Reminds me of C. P. Snow's Three Laws of Thermodynamics.