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: Emacs-diffs Digest, Vol 53, Issue 105 Date: Tue, 01 May 2007 12:47:04 -0400 Message-ID: References: <7qslakdz99.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1178038038 5929 80.91.229.12 (1 May 2007 16:47:18 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 1 May 2007 16:47:18 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 01 18:47:16 2007 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.50) id 1HivVT-0000BC-TL for ged-emacs-devel@m.gmane.org; Tue, 01 May 2007 18:47:16 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hivbn-0001EB-2J for ged-emacs-devel@m.gmane.org; Tue, 01 May 2007 12:53:47 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hivbj-0001E5-Tm for emacs-devel@gnu.org; Tue, 01 May 2007 12:53:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hivbh-0001Dn-W7 for emacs-devel@gnu.org; Tue, 01 May 2007 12:53:43 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hivbh-0001Dk-Rd for emacs-devel@gnu.org; Tue, 01 May 2007 12:53:41 -0400 Original-Received: from tomts13.bellnexxia.net ([209.226.175.34] helo=tomts13-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HivVJ-0005OA-RN; Tue, 01 May 2007 12:47:06 -0400 Original-Received: from pastel.home ([74.12.209.226]) by tomts13-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20070501164704.CKKR1593.tomts13-srv.bellnexxia.net@pastel.home>; Tue, 1 May 2007 12:47:04 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 713898078; Tue, 1 May 2007 12:47:04 -0400 (EDT) In-Reply-To: (Richard Stallman's message of "Mon\, 30 Apr 2007 18\:09\:48 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-detected-kernel: Solaris 8 (1) 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:70446 Archived-At: > 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? The sync is not done both ways. It just makes sure that if we install a fix for Emacs-22.1 it won't come and bite us again in Emacs-23 because we forgot to also install it on the trunk. > And what about cases where we want to make different changes in the branch > and the trunk (such as timeclock.el)? I don't see any problem either: - install the change on the branch - merge into the trunk - improve the change on the trunk or - install both changes on their respective branches - when the branch gets merged onto the trunk you'll get a conflict which you resolve by simply selecting the trunk's code. Stefan