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

Re: [PATCH] RapidSVN first impressions, and a small fix

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-07-26 18:32:04 CEST

Garrett Rooney wrote:
>
> On Fri, Jul 26, 2002 at 02:46:08PM +0200, Alexander Mueller wrote:
> > Tried to apply your patch. Resulted some errors:
> > $ patch -i p
> > patching file `tracer.cpp'
> > Hunk #2 FAILED at 59.
> > 1 out of 2 hunks FAILED -- saving rejects to tracer.cpp.rej
> > patching file `tracer.h'
> > patching file `exceptions.cpp'
> > Hunk #2 FAILED at 25.
> > 1 out of 2 hunks FAILED -- saving rejects to exceptions.cpp.rej
> > patching file `exceptions.h'
> > Hunk #2 FAILED at 33.
> > 1 out of 2 hunks FAILED -- saving rejects to exceptions.h.rej
> >
> > could you check this?
>
> i'll take a look tonight sometime. the diffs were just produced by
> 'svn diff' though, so they should apply fine... perhaps a line ending
> issue or something? i noticed that some of the files had windows line
> endings.

I've had problems with this too. If I save an email with a svn diff
and apply the patch, I get failures. If I select-all the email and
paste it into a file and then apply the patch, it works fine.

I use Windows as my terminal but do the work on a Linux box. Running
dos2unix on the saved email doesn't help.

Best,
Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 26 18:33:14 2002

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.