From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Repairing the elpa branch Date: Mon, 14 Jan 2013 10:15:29 -0500 Message-ID: References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1358266601 9151 80.91.229.3 (15 Jan 2013 16:16:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jan 2013 16:16:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 15 17:16:58 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 1Tv9C2-0007mG-Dx for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 17:16:54 +0100 Original-Received: from localhost ([::1]:53730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Bl-000476-Sa for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 11:16:37 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:52978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Bf-00046z-R0 for emacs-devel@gnu.org; Tue, 15 Jan 2013 11:16:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9Bb-0003xt-K5 for emacs-devel@gnu.org; Tue, 15 Jan 2013 11:16:31 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:45337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Bb-0003xj-Dl; Tue, 15 Jan 2013 11:16:27 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id r0FGGKTQ028859; Tue, 15 Jan 2013 11:16:21 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 292B9AE3DF; Mon, 14 Jan 2013 10:15:31 -0500 (EST) In-Reply-To: <87fw24fl09.fsf@gnu.org> (Chong Yidong's message of "Mon, 14 Jan 2013 12:26:14 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4462=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4462> : streams <890146> : uri <1319545> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:156386 Archived-At: >> 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. Another direction (which I think is preferable/needed in the longer term) is to better support "one branch per ELPA package". Stefan