mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Andrew Morton <akpm@zip.com.au>, linux-kernel@vger.kernel.org
Subject: Re: Kernel SCM: When does CVS fall down where it REALLY matters?
Date: Sun, 10 Mar 2002 21:27:45 +0100	[thread overview]
Message-ID: <20020310202745.GB173@elf.ucw.cz> (raw)
In-Reply-To: <3C87FD12.8060800@greshamstorage.com> <Pine.LNX.4.44L.0203072057510.2181-100000@imladris.surriel.com> <3C880541.E04EFAB3@zip.com.au> <15496.6235.723025.422239@notabene.cse.unsw.edu.au>
In-Reply-To: <15496.6235.723025.422239@notabene.cse.unsw.edu.au>

Hi!

> > The problem I find is that I often want to take (file1+patch) -> file2,
> > when I don't have file1.  But merge tools want to take (file1|file2) -> file3.
> > I haven't seen a graphical tool which helps you to wiggle a patch into
> > a file.
> 
> If your saying what I think you're saying, I completely agree.
> I often run "patch" and it drops some chunk because it doesn't match,
> and it turns out that the miss-match is just one or two lines in a
> chunk that could be very big.
> 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".

Yes, this would be [: very very :] nice.
									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

  reply	other threads:[~2002-03-11 18:35 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-03-07 23:51 Jonathan A. George
2002-03-07 23:59 ` Rik van Riel
2002-03-08  0:03   ` Cort Dougan
2002-03-09 11:17     ` Roman Zippel
2002-03-09 16:45       ` Kurt Roeckx
2002-03-08  0:26   ` Andrew Morton
2002-03-08  0:36     ` Rik van Riel
2002-03-08  1:48     ` Neil Brown
2002-03-10 20:27       ` Pavel Machek [this message]
2002-03-11 21:11         ` Rik van Riel
2002-03-12 16:31           ` Pavel Machek
2002-03-08  7:37     ` Alex Riesen
2002-03-08  0:29   ` Jonathan A. George
2002-03-08  0:43     ` Rik van Riel
2002-03-08  9:32       ` Pau Aliagas
2002-03-08 16:37         ` Rik van Riel
2002-03-08 20:15           ` Pau Aliagas
2002-03-08 20:22             ` Rik van Riel
2002-03-08 20:28               ` Pau Aliagas
2002-03-08  0:38   ` Erik Andersen
2002-03-08  9:38     ` Pau Aliagas
2002-03-09  1:52     ` Val Henson
2002-03-09  2:00       ` Mike Fedyk
2002-03-09  2:25       ` Dave Jones
2002-03-08  1:19   ` Dave Jones
2002-03-08 20:27     ` Jonathan A. George
2002-03-08 21:59       ` Eli
2002-03-08  3:15   ` H. Peter Anvin
2002-03-08  9:39     ` Pau Aliagas
2002-03-11 17:05   ` Larry McVoy
2002-03-11 17:12     ` Randy.Dunlap
2002-03-11 17:25       ` Larry McVoy
2002-03-11 17:53       ` Jonathan A. George
2002-03-11 18:03         ` Larry McVoy
2002-03-11 20:36     ` Rik van Riel
2002-03-11 21:01       ` Larry McVoy
2002-03-11 21:28         ` Rik van Riel
2002-03-10 19:28 ` Pavel Machek
2002-03-09 22:22 Tom Lord
2002-03-11 17:10 ` Larry McVoy
2002-03-12  6:09 ` Tom Lord

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=20020310202745.GB173@elf.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=akpm@zip.com.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=neilb@cse.unsw.edu.au \
    /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

all inboxes | Powered by JetHome®