[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 19:35:37 CET

Sean Russell <ser@germane-software.com> writes:

> BTW, I've encountered what I think is a problem with svn's rejects;
> I had a file I was testing these scripts on; it has about 36 lines
> in it. Just recently, testing this shell script, I got a reject
> file that only included the diff from the first half of the file;
> the changes near the end weren't in the reject file. I'm not sure I
> can reproduce this, but I'll try. This is the first time I've seen
> this, and the changes I make to the file to cause the conflict are
> each time very similar. What I'm wondering is if the SVN diff
> algorithm is thoroughly tested?

Well, we've been using it for almost 6 months since we went
self-hosting. :-) I sent an outline of the algorithm over the

If something's wrong, it sounds like 'patch' is misbehaving. I mean,
we create a diff between old-text-base and new-text-base, then have
'patch' apply that diff to the working file, with a .rej file on the
commandline. I don't know why 'patch' would only put partial rejects
into the .rej file...

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.