From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Emacs-diffs Digest, Vol 53, Issue 105
Date: Mon, 30 Apr 2007 18:09:48 -0400
Message-ID: <E1Hie44-00024V-6u@fencepost.gnu.org>
References: <E1Hgjui-0002h5-O7@monty-python.gnu.org>
	<E1HgvXF-0002uf-8P@fencepost.gnu.org>
	<7qslakdz99.fsf@fencepost.gnu.org>
	<E1HiH8N-0006gl-Ju@fencepost.gnu.org>
	<jwvhcqyu1bx.fsf-monnier+emacs@gnu.org>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: sea.gmane.org 1177971464 7448 80.91.229.12 (30 Apr 2007 22:17:44 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Mon, 30 Apr 2007 22:17:44 +0000 (UTC)
Cc: rgm@gnu.org, emacs-devel@gnu.org
To: Stefan Monnier <monnier@iro.umontreal.ca>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 01 00:17:39 2007
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.50)
	id 1HieBZ-0005Ck-78
	for ged-emacs-devel@m.gmane.org; Tue, 01 May 2007 00:17:33 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1HieHn-0005p0-4Q
	for ged-emacs-devel@m.gmane.org; Mon, 30 Apr 2007 18:23:59 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HieD3-0001kJ-UO
	for emacs-devel@gnu.org; Mon, 30 Apr 2007 18:19:06 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HieD3-0001jw-7H
	for emacs-devel@gnu.org; Mon, 30 Apr 2007 18:19:05 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HieD3-0001jp-1k
	for emacs-devel@gnu.org; Mon, 30 Apr 2007 18:19:05 -0400
Original-Received: from fencepost.gnu.org ([199.232.76.164])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1Hie6o-0003BS-6x
	for emacs-devel@gnu.org; Mon, 30 Apr 2007 18:12:38 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60)
	(envelope-from <rms@gnu.org>)
	id 1Hie44-00024V-6u; Mon, 30 Apr 2007 18:09:48 -0400
In-reply-to: <jwvhcqyu1bx.fsf-monnier+emacs@gnu.org> (message from Stefan
	Monnier on Sun, 29 Apr 2007 20:57:23 -0400)
X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4)
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/pipermail/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:70430
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/70430>

    Better not: since the script copies changes from the branch to the trunk,
    it's better to install changes only on one or the other, but not on both,
    otherwise you'll end up with spurious conflicts and/or duplicated changes.

That would be one way of doing it -- but then what use is it to have
the separate branch?  And what about cases where we want to make
different changes in the branch and the trunk (such as timeclock.el)?