From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Emacs-diffs Digest, Vol 53, Issue 105 Date: Sun, 29 Apr 2007 21:44:40 -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 1177897657 29274 80.91.229.12 (30 Apr 2007 01:47:37 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 30 Apr 2007 01:47:37 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 30 03:47:35 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 1HiKzH-0003SG-6y for ged-emacs-devel@m.gmane.org; Mon, 30 Apr 2007 03:47:35 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HiL5P-00087D-59 for ged-emacs-devel@m.gmane.org; Sun, 29 Apr 2007 21:53:55 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HiL5L-00086y-EN for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:53:51 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HiL5K-00086m-4P for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:53:50 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HiL5J-00086j-VY for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:53:50 -0400 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HiKzB-0008GG-Ax for emacs-devel@gnu.org; Sun, 29 Apr 2007 21:47:29 -0400 Original-Received: from [127.0.0.1] (helo=localhost) by fencepost.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HiKwT-0002wW-89; Sun, 29 Apr 2007 21:44:41 -0400 X-Spook: PLO JFK New World Order Sears Tower Crypto AG Adriatic X-Ran: DL,$sM@]d9k.KCn5lo'_uD+?"TY"XW9YN|>OiJudBez!,yEJ}I&Qlce[`%*0]Y^vLz9@Hh X-Hue: blue X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Sun, 29 Apr 2007 20:57:23 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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." 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:70389 Archived-At: Stefan Monnier wrote: > 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. If it's really that fragile, is that acceptable? I for one have been installing things in both places, largely because it's very little extra effort, and I like to get a "proper" CVS log entry. Eg this: (hi-lock-file-patterns-policy): Default to `ask'. rather than all this: Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (base, patch 1-2) - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709 - Sync to CVS tag EMACS_22_BRANCHPOINT - Sync to CVS branch EMACS_22_BASE 2007-04-25 Richard Stallman * lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. 2007-04-24 Richard Stallman * lispref/text.texi (Special Properties): Add xref to Overlay Properties. * lispref/display.texi (Overlay Properties): Add xref to Special Properties. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-716