From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.help Subject: Re: How to edit/modify patches using emacs? Date: Mon, 09 May 2005 08:38:16 +0900 Message-ID: <87zmv5l253.fsf@tc-1-100.kawasaki.gol.ne.jp> References: <427df645$0$26177$9b622d9e@news.freenet.de> <87u0ldx29s.fsf@thalassa.informatimago.com> <87ekchn5dd.fsf@tc-1-100.kawasaki.gol.ne.jp> Reply-To: Miles Bader NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1115595786 12234 80.91.229.2 (8 May 2005 23:43:06 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 8 May 2005 23:43:06 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Mon May 09 01:43:01 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DUvQK-0002LL-VE for geh-help-gnu-emacs@m.gmane.org; Mon, 09 May 2005 01:43:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DUvYY-00019s-91 for geh-help-gnu-emacs@m.gmane.org; Sun, 08 May 2005 19:51:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DUvXK-0000WX-LN for help-gnu-emacs@gnu.org; Sun, 08 May 2005 19:50:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DUvXH-0000VQ-7n for help-gnu-emacs@gnu.org; Sun, 08 May 2005 19:50:11 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DUvXF-0000SD-JP for help-gnu-emacs@gnu.org; Sun, 08 May 2005 19:50:09 -0400 Original-Received: from [203.216.5.72] (helo=smtp02.dentaku.gol.com) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1DUvRe-0006EJ-7z; Sun, 08 May 2005 19:44:22 -0400 Original-Received: from localhost ([127.0.0.1]) by smtp02.dentaku.gol.com with esmtp (Dentaku) id 1DUvLm-0006Mw-Jw; Mon, 09 May 2005 08:38:18 +0900 Original-Received: from yokohama2-61-203-152-190.ap.0038.net ([61.203.152.190] helo=tc-1-100.kawasaki.gol.ne.jp) by smtp02.dentaku.gol.com with esmtpa (Dentaku) id 1DUvLl-0006Mp-TR; Mon, 09 May 2005 08:38:18 +0900 Original-Received: by tc-1-100.kawasaki.gol.ne.jp (Postfix, from userid 1000) id 565DBFB3; Mon, 9 May 2005 08:38:16 +0900 (JST) Original-To: help-gnu-emacs@gnu.org System-Type: i686-pc-linux-gnu In-Reply-To: (Micha Feigin's message of "Mon, 9 May 2005 00:54:11 +0300") Original-Lines: 17 X-Virus-Scanned: by AMaViS GOL X-Abuse-Complaints: abuse@gol.com X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:26441 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:26441 Micha Feigin writes: >> [A common reason to edit a patch is because it _won't_ apply otherwise: >> you basically look at the patch to see why doesn't match the source, >> edit the patch to test your guess, and if it then applies cleanly, >> you've got a nice record in the edited patch.] > > In such cases I just prefer to apply the patch and fix the rejects, gives you a > better overall view. But that's the whole point -- certain hunks won't apply until you either fix them to apply or fix the source so it can be "applied to"; I prefer the former because it's generally easier to maintain a record of what changed. -Miles -- `Life is a boundless sea of bitterness'