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: Sun, 29 Apr 2007 20:57:23 -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 1177894657 22854 80.91.229.12 (30 Apr 2007 00:57:37 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 30 Apr 2007 00:57:37 +0000 (UTC) Cc: Glenn Morris , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 30 02:57:36 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 1HiKCr-0002LZ-Gf for ged-emacs-devel@m.gmane.org; Mon, 30 Apr 2007 02:57:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HiKIz-0001Qb-6L for ged-emacs-devel@m.gmane.org; Sun, 29 Apr 2007 21:03:53 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HiKIv-0001QV-D4 for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:03:49 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HiKIs-0001QJ-UM for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:03:49 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HiKIs-0001QG-Pq for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:03:46 -0400 Original-Received: from tomts20.bellnexxia.net ([209.226.175.74] helo=tomts20-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HiKCi-0004Cb-Ts; Sun, 29 Apr 2007 20:57:25 -0400 Original-Received: from pastel.home ([70.55.145.115]) by tomts20-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20070430005723.VAKV1637.tomts20-srv.bellnexxia.net@pastel.home>; Sun, 29 Apr 2007 20:57:23 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 5F8908074; Sun, 29 Apr 2007 20:57:23 -0400 (EDT) In-Reply-To: (Richard Stallman's message of "Sun\, 29 Apr 2007 17\:40\:43 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.97 (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:70386 Archived-At: >> I made a few changes in the EMACS_22_BASE branch. >> Can someone please transfer them to the trunk? > For the record, I think Miles did this with some merge script thing. > Thanks to whoever did it. > I am now set up to install in both places myself. 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. Stefan