public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: Martin Blais <blais@iro.umontreal.ca>
Cc: linux-kernel@vger.kernel.org
Subject: Re: xxdiff as a visual diff tool (shameless plug)
Date: Fri, 22 Mar 2002 10:27:13 +0100	[thread overview]
Message-ID: <20020322092712.GA233@elf.ucw.cz> (raw)
In-Reply-To: <20020321061423.HIXG2746.tomts17-srv.bellnexxia.net@there>

Hi!

> I actually wanted to implement it exactly like this in xxdiff,
> and I think it may not be too hard. Something like
> 
>   "xxdiff --patch file1 < patch"
> 
> and it would display as two files, and allow you to save merged
> results. That was the plan (read more below).
> 
> I wanted to spawn a patch command on it and recuperate the
> output and then run diff and display that, so one could use and
> alternate patch program as well, and I would reuse patch's
> heuristics automatically (e.g. i don't have to code it myself).

... but ...

> > Neil Brown agreed with this, and said, "I would like a tool
> > (actually an emacs mode) that would show me exactly why a patch
> > fails, and allow me to edit bits until it fits, and then apply
> > it. I assume that is what you mean by "wiggle a patch into a
> > file"." Pavel Machek also thought this would be a rerally great
> > thing.
> 
> The part I haven't figured out a nice solution for yet, is for
> the failed hunks... how to display them sensibly.  I was
> thinking of using the 3-file display with the third file
> showing only the failed hunks in the approximate location where
> they were supposed to be. Not sure how to do this yet. Any
> ideas welcome.

It would be great to somehow split patches before feeding them to the
patch. If you have one big hunk, and it fails because of one letter
added somewhere in file, it is *big pain* to find/kill offending
letter.

									Pavel
-- 
(about SSSCA) "I don't say this lightly.  However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa

  parent reply	other threads:[~2002-03-22 10:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-03-21  6:13 xxdiff as a visual diff tool (shameless plug) Martin Blais
2002-03-21 10:43 ` Tim Waugh
2002-03-22  9:27 ` Pavel Machek [this message]
2002-03-22 10:27   ` Andrew Morton
2002-03-22 18:19   ` Martin Blais
2002-03-22 18:25   ` Martin Blais
2002-03-22 21:44     ` Pavel Machek
2002-03-23 20:46       ` Martin Blais
2002-03-23 23:39         ` Pavel Machek
2002-03-25  6:53 ` Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20020322092712.GA233@elf.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=blais@iro.umontreal.ca \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox