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: Merging emacs-23 into trunk Date: Wed, 10 Nov 2010 14:44:49 +0900 Message-ID: <87bp5xg2b2.fsf@uwakimon.sk.tsukuba.ac.jp> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1289367765 4734 80.91.229.12 (10 Nov 2010 05:42:45 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 05:42:45 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 06:42:41 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PG3SD-00079x-2U for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 06:42:41 +0100 Original-Received: from localhost ([127.0.0.1]:33448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PG3SC-0005cO-CI for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 00:42:40 -0500 Original-Received: from [140.186.70.92] (port=35943 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PG3S6-0005Zs-3w for emacs-devel@gnu.org; Wed, 10 Nov 2010 00:42:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PG3S4-0005f7-MY for emacs-devel@gnu.org; Wed, 10 Nov 2010 00:42:33 -0500 Original-Received: from imss12.cc.tsukuba.ac.jp ([130.158.254.161]:56950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PG3S4-0005eX-AX; Wed, 10 Nov 2010 00:42:32 -0500 Original-Received: from imss12.cc.tsukuba.ac.jp (imss12.cc.tsukuba.ac.jp [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id CB9522AF543; Wed, 10 Nov 2010 14:42:28 +0900 (JST) Original-Received: from mgmt1.sk.tsukuba.ac.jp (unknown [130.158.97.223]) by imss12.cc.tsukuba.ac.jp (Postfix) with ESMTP id BD23B2AF542; Wed, 10 Nov 2010 14:42:28 +0900 (JST) Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt1.sk.tsukuba.ac.jp (Postfix) with ESMTP id B92103FA04FE; Wed, 10 Nov 2010 14:42:28 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 65D771A3EDE; Wed, 10 Nov 2010 14:44:49 +0900 (JST) In-Reply-To: X-Mailer: VM undefined under 21.5 (beta29) "garbanzo" ed3b274cc037 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132496 Archived-At: Glenn Morris writes: > Can you make it just skip merging configure altogether? Not really. That's inherent in the philosophy of atomic commits and DAG-based merging. A very dedicated maintainer with nothing better to do might be able to make it appear like it isn't being merged by maintaining a separate "no-configure" branch in which configure has been "bzr rm'd", then merging Branch-A --> no-configure --> Branch-B. I suspect that the Branch-A --> no-configure merge will throw a remove/modify conflict every time, but even if so this should be easy to automate with a "bzr replay-recorded-resolution" command (a la git's "rerere" command, if you know about that). If there isn't one already, the Bazaar team might be willing to cons one up. Similar considerations would apply on the no-configure --> Branch-B side.