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 20:38:38 -0500 Message-ID: References: <18obgsphrv.fsf@fencepost.gnu.org> <87fw24fl09.fsf@gnu.org> <83txqjrcxb.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1358213932 10501 80.91.229.3 (15 Jan 2013 01:38:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jan 2013 01:38:52 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 15 02:39:09 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 1TuvUV-0007O2-Lu for ged-emacs-devel@m.gmane.org; Tue, 15 Jan 2013 02:39:03 +0100 Original-Received: from localhost ([::1]:34146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuvUF-0000vd-EA for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2013 20:38:47 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:53780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuvUB-0000vL-V1 for emacs-devel@gnu.org; Mon, 14 Jan 2013 20:38:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TuvUB-00059S-0Q for emacs-devel@gnu.org; Mon, 14 Jan 2013 20:38:43 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:48793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuvU8-00058w-Ce; Mon, 14 Jan 2013 20:38:40 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtkGAG6Zu09FpZpV/2dsb2JhbABEgXuyFoEIghUBAQQBViMQCzQSFBgNJC6HbgW6CZBEA4hCmnGBWIMH X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="212562518" Original-Received: from 69-165-154-85.dsl.teksavvy.com (HELO pastel.home) ([69.165.154.85]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 14 Jan 2013 20:38:39 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 37F6C5927F; Mon, 14 Jan 2013 20:38:38 -0500 (EST) In-Reply-To: <83txqjrcxb.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 14 Jan 2013 17:40:00 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:156362 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. > What about the alternative of using the fast-import plugin? The > following works for me with bzr 2.5.1 and 2.6b1: This loses the merge info. Stefan