From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: changes to cfengine-mode Date: Thu, 08 Dec 2011 17:52:27 +0800 Message-ID: <87fwgvqtk4.fsf@gnu.org> References: <87ipmcgjot.fsf@lifelogs.com> <83lir89gne.fsf@gnu.org> <87aa7ogfo3.fsf@lifelogs.com> <87fwhffv37.fsf@lifelogs.com> <877h2ridev.fsf@gnu.org> <8739dfezc1.fsf@lifelogs.com> <87aa7m5a6b.fsf@gnu.org> <877h2oe3yj.fsf@lifelogs.com> <877h2ngnhb.fsf@marauder.physik.uni-ulm.de> <87hb1qb9ot.fsf@lifelogs.com> <87pqg82tdy.fsf@lifelogs.com> <87pqg7x89t.fsf_-_@lifelogs.com> <8739cwtzh8.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1323337978 20569 80.91.229.12 (8 Dec 2011 09:52:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 8 Dec 2011 09:52:58 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 08 10:52:51 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RYaej-0003qw-Eq for ged-emacs-devel@m.gmane.org; Thu, 08 Dec 2011 10:52:45 +0100 Original-Received: from localhost ([::1]:42763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYaei-0002hj-Ud for ged-emacs-devel@m.gmane.org; Thu, 08 Dec 2011 04:52:44 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:60757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYaec-0002gi-PD for emacs-devel@gnu.org; Thu, 08 Dec 2011 04:52:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYaeY-0007Ae-R1 for emacs-devel@gnu.org; Thu, 08 Dec 2011 04:52:38 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:59651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYaeY-0007AZ-NL for emacs-devel@gnu.org; Thu, 08 Dec 2011 04:52:34 -0500 Original-Received: from [155.69.19.98] (port=45601 helo=furball) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RYaeX-0004LZ-TA; Thu, 08 Dec 2011 04:52:34 -0500 In-Reply-To: (Stefan Monnier's message of "Wed, 07 Dec 2011 11:10:23 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:146575 Archived-At: Stefan Monnier writes: >> 4) give a version and set it to 1.1 for this release > > We don't like versions for files bundled with Emacs (only serves to > cause spurious merge conflicts), so if you can keep this outside of the > tree, it's preferable. Surely such merge conflicts are trivial to resolve. Having version numbers has the advantage that it should DTRT with ELPA if you have both a built-in package and an external package.