From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging emacs-23 into trunk
Date: Wed, 10 Nov 2010 06:59:55 -0500
Message-ID: <E1PG9LH-0007HP-Vc@fencepost.gnu.org>
References: <jwvzktiyyuw.fsf-monnier+emacs@gnu.org>
	<lahbfpssof.fsf@fencepost.gnu.org>
	<87bp5xg2b2.fsf@uwakimon.sk.tsukuba.ac.jp>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1289390410 31555 80.91.229.12 (10 Nov 2010 12:00:10 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 10 Nov 2010 12:00:10 +0000 (UTC)
Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 13:00:06 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PG9LS-00052Z-3R
	for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 13:00:06 +0100
Original-Received: from localhost ([127.0.0.1]:52591 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PG9LR-0007K4-Iz
	for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 07:00:05 -0500
Original-Received: from [140.186.70.92] (port=38904 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PG9LM-0007Iy-0g
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 07:00:00 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PG9LK-0003Wh-Ny
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 06:59:59 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:33210)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PG9LK-0003Wd-LB
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 06:59:58 -0500
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1PG9LH-0007HP-Vc; Wed, 10 Nov 2010 06:59:56 -0500
In-reply-to: <87bp5xg2b2.fsf@uwakimon.sk.tsukuba.ac.jp> (stephen@xemacs.org)
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." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:132501
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/132501>

> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Date: Wed, 10 Nov 2010 14:44:49 +0900
> Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>, emacs-devel@gnu.org
> 
> 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.

I don't follow.  Do you have in mind a revision where configure was
committed together with other files?  If so, I understand.  But if it
was committed alone, what is the issue with atomic commits?