From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ilya Zakharevich Newsgroups: gmane.emacs.devel Subject: Re: CPerl-mode bug [Re: Relation with package authors (CPerl-mode follow-ups)] Date: Fri, 1 Jul 2005 16:06:18 -0700 Message-ID: <20050701230618.GA19693@math.berkeley.edu> References: <877jgrj22g.fsf_-_@marant.org> <87mzp9bnrm.fsf-monnier+emacs@gnu.org> <20050630043416.GA14713@math.berkeley.edu> <20050630053339.GA14841@math.berkeley.edu> <20050630070427.GA15050@math.berkeley.edu> <20050630183237.GA16162@math.berkeley.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1120260418 1542 80.91.229.2 (1 Jul 2005 23:26:58 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 1 Jul 2005 23:26:58 +0000 (UTC) Cc: snogglethorpe@gmail.com, emacs-devel@gnu.org, Stefan Monnier , Ilya Zakharevich , J?r?me Marant Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 02 01:26:56 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DoUty-0006Mu-NK for ged-emacs-devel@m.gmane.org; Sat, 02 Jul 2005 01:26:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DoV2W-0000oO-Cn for ged-emacs-devel@m.gmane.org; Fri, 01 Jul 2005 19:35:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DoV2L-0000nw-NF for emacs-devel@gnu.org; Fri, 01 Jul 2005 19:35:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DoV2L-0000ni-7k for emacs-devel@gnu.org; Fri, 01 Jul 2005 19:35:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DoUyH-0007gs-52 for emacs-devel@gnu.org; Fri, 01 Jul 2005 19:30:57 -0400 Original-Received: from [169.229.58.57] (helo=mail.math.berkeley.edu) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1DoUfk-0000pC-Ku; Fri, 01 Jul 2005 19:11:48 -0400 Original-Received: from powdermilk.math.berkeley.edu (IDENT:5930@powdermilk.Math.Berkeley.EDU [169.229.140.13]) by mail.math.berkeley.edu (8.13.4/8.13.1) with ESMTP id j61N6Jim010108; Fri, 1 Jul 2005 16:06:20 -0700 (PDT) (envelope-from ilya@math.berkeley.edu) Original-Received: (from ilya@localhost) by powdermilk.math.berkeley.edu (8.12.10+Sun/8.12.10/Submit) id j61N6JDK019698; Fri, 1 Jul 2005 16:06:19 -0700 (PDT) Original-To: Miles Bader Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-Scanned-By: MIMEDefang 2.52 on 169.229.58.57 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:40063 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:40063 On Fri, Jul 01, 2005 at 10:20:31AM +0900, Miles Bader wrote: > Ilya Zakharevich writes: > > *Something* must be done in this situation. > > Sure, it sounds like a proper merge is in order. > > That is, apply all Emacs changes since the last merge point to your > current version, and resolve any conflicts. My point is that most edits must be removed, since they introduce much more problems than they fix. Hope this helps, Ilya