From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Repairing the elpa branch Date: Mon, 14 Jan 2013 12:26:14 +0800 Message-ID: <87fw24fl09.fsf@gnu.org> References: <18obgsphrv.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1358137596 2779 80.91.229.3 (14 Jan 2013 04:26:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2013 04:26:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 14 05:26:54 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 1TubdL-0006Bn-Pe for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2013 05:26:51 +0100 Original-Received: from localhost ([::1]:47143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tubd5-0004ty-I5 for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2013 23:26:35 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:45952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tubcw-0004tZ-Ev for emacs-devel@gnu.org; Sun, 13 Jan 2013 23:26:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tubcr-00005g-FY for emacs-devel@gnu.org; Sun, 13 Jan 2013 23:26:26 -0500 Original-Received: from mail-pb0-f49.google.com ([209.85.160.49]:49721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tubcr-00005U-9s; Sun, 13 Jan 2013 23:26:21 -0500 Original-Received: by mail-pb0-f49.google.com with SMTP id un15so1938859pbc.36 for ; Sun, 13 Jan 2013 20:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=4xLfDOWGQYBByazLwMFCw3DfIvtO7oQdHyHAzZexa5M=; b=dhXeKWSomNZnPHNDJHyJovWyGHR9bbe4s1XJDqipK0nXuV8sls03sfcdxQk4DUMeM5 aFUy//jWw8JQqDTO55ltvfz27J2GbJpYtcJaG8Rky2RCdm5X495wEk6Js5bGFY+Ey8qr X9Q0sWEcr/nFpiwOE6FZUp5w7tuUQGouVIDXV7sh82YYSjJEEHxOxE9svdNn0GNGkfNf p/8f0ERlOyEUMI5SgDW8PeTM8b4JGnSU0LwYg+YOc/bBaUWfitJAfbrhup5PRRNxaBXx a66efzfa7NXEXwYi/V6mrzWdhOire8L2VmeZz3PN//tpUb38WzCiXT9Rr2XeL0KxtIT4 9hJQ== X-Received: by 10.68.253.1 with SMTP id zw1mr96181121pbc.98.1358137579864; Sun, 13 Jan 2013 20:26:19 -0800 (PST) Original-Received: from tsparkle ([155.69.17.221]) by mx.google.com with ESMTPS id oz9sm7435430pbb.68.2013.01.13.20.26.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 13 Jan 2013 20:26:18 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Sun, 13 Jan 2013 23:11:35 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.49 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:156336 Archived-At: Stefan Monnier writes: > I think capturing those merges is important. > > subsequent syncs with upstream are made more difficult if you use flat > commits. I think it is a matter of picking the lesser of two evils. Not being able to check out the branch at all (without a non-obvious workaround) seems to be much worse problem, compared with a bit of difficulty syncing with upstream. Since no one else has come up with a better solution, maybe we should go with Glenn's.