From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: pierre.catello@gmail.com Newsgroups: gmane.emacs.help Subject: Ediff patching ? Date: Fri, 4 Jul 2008 07:08:59 -0700 (PDT) Organization: http://groups.google.com Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1215188139 31494 80.91.229.12 (4 Jul 2008 16:15:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Jul 2008 16:15:39 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Jul 04 18:16:26 2008 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KEnxA-0006wD-K5 for geh-help-gnu-emacs@m.gmane.org; Fri, 04 Jul 2008 18:16:08 +0200 Original-Received: from localhost ([127.0.0.1]:56204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KEnwJ-0000oi-RA for geh-help-gnu-emacs@m.gmane.org; Fri, 04 Jul 2008 12:15:15 -0400 Original-Path: news.stanford.edu!newsfeed.stanford.edu!postnews.google.com!z72g2000hsb.googlegroups.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 22 Original-NNTP-Posting-Host: 131.254.15.13 Original-X-Trace: posting.google.com 1215180539 28509 127.0.0.1 (4 Jul 2008 14:08:59 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Fri, 4 Jul 2008 14:08:59 +0000 (UTC) Complaints-To: groups-abuse@google.com Injection-Info: z72g2000hsb.googlegroups.com; posting-host=131.254.15.13; posting-account=tZoprgkAAABTHEa5RyDCWn8tKje0-JaB User-Agent: G2/1.0 X-HTTP-UserAgent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_3; fr-fr) AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.1 Safari/525.18, gzip(gfe), gzip(gfe) Original-Xref: news.stanford.edu gnu.emacs.help:159893 X-Mailman-Approved-At: Fri, 04 Jul 2008 12:14:56 -0400 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:55243 Archived-At: Hello, I'm new to Ediff, and I have some troubles with the interactive patching facility... 1) when I try to apply a patch to a particular file (ediff-patch- file), there are 3 hunks out of 12 which fail. When using the standalone patch tool, only the last hunk fails. And when using the command ediff-patch-buffer, it is only the last hunk which fail (same as with the standalone patch). Why do ediff-patch-file and ediff-patch- buffer do not have the same result on the same input ? 2) when ediff-patch-buffer fails on a hunk, there is not __patched buffer, so it is not possible to solve the reject... Am I missing something ? 3) Is it possible for Ediff for reviewing patch hunks interactively ? I mean, when applying a patch, there is the same output as with the standalone patch and it does not seem possible to browse through the hunks that raise the reject. Thanks for your help !