From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: [pixel@mandriva.com: segfault on buggy .gif + patch to fix it] Date: Fri, 07 Sep 2007 13:42:59 +0100 Message-ID: <46E14753.1060104@gnu.org> References: <87bqcf54rn.fsf@gnuvola.org> <18145.68.3494.291167@kahikatea.snap.net.nz> <87zlzy69sl.fsf@gnuvola.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1189169005 14233 80.91.229.12 (7 Sep 2007 12:43:25 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 7 Sep 2007 12:43:25 +0000 (UTC) Cc: Nick Roberts , rms@gnu.org, emacs-devel@gnu.org To: Thien-Thi Nguyen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 07 14:43:25 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 1ITdBE-0002yX-3Z for ged-emacs-devel@m.gmane.org; Fri, 07 Sep 2007 14:43:24 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ITdBC-0006LT-Ry for ged-emacs-devel@m.gmane.org; Fri, 07 Sep 2007 08:43:22 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ITdBA-0006Kw-6c for emacs-devel@gnu.org; Fri, 07 Sep 2007 08:43:20 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ITdB8-0006KU-Mh for emacs-devel@gnu.org; Fri, 07 Sep 2007 08:43:19 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ITdB8-0006KN-Is for emacs-devel@gnu.org; Fri, 07 Sep 2007 08:43:18 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ITdB3-0007UJ-JJ; Fri, 07 Sep 2007 08:43:13 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id D676750F14; Fri, 7 Sep 2007 13:43:11 +0100 (BST) User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) In-Reply-To: <87zlzy69sl.fsf@gnuvola.org> X-Detected-Kernel: Linux 2.4-2.6 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:78150 Archived-At: Thien-Thi Nguyen wrote: > is this "miles-automatic" or machine-automatic? > if the former, i don't mind reducing the burden > a little for miles (if miles doesn't mind). > If there are no conflicts (and arch is supposed to be better than CVS at tracking merge history to minimize conflicts) then it should be machine-automatic with little input needed from Miles. I always leave it to the automatic merging on the assumption that manual changes are more likely to cause spurious conflicts than just leaving it.