[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-02-11 20:01:07 CET

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?

> To clarify, the problem was that the .rej file generated by 'svn up' was
> missing the diff for the second change. I don't want to raise any alarm
> flags about this until I know I can reproduce it; that's why I asked about
> any known issues.

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

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.