[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: patchify, shell version

From: Sean Russell <ser_at_germane-software.com>
Date: 2002-02-12 18:00:32 CET

Hash: SHA1

On Monday 11 February 2002 11:01 am, Ben Collins-Sussman wrote:
> Sean Russell <ser@germane-software.com> writes:
> > Hmmm... is patch being used to create the .rej files? I'd think that
> > would be the job of diff.
> Huh? A .rej file contains failed hunks, i.e. hunks that 'patch'
> failed to apply to a file. Is there some other kind of .rej file?

Oh, I see. The second hunk (diff, patch, whatever) must have succeeded and
not been in the .rej file.

> As Karl said, the .rej file only contains *failed* hunks... in other
> words, only the hunks that were in conflict. If other hunks worked,
> then they were applied to the working file. That's the behavior we
> want -- the .rej file only shows you the specific parts that
> conflicted. I don't think we want the patch to be applied
> all-or-nothing.

Right. You're absolutely right. Sorry for the confusion.

- --
 |.. "It isn't pre-marital sex if you don't get married"
<|> -- anon
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:06 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.