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

Re: patch bug report WAS problems applying patches created by tortoiseSVN in linux

From: Demian Turner <demian_at_phpkitchen.com>
Date: 2005-11-21 11:52:45 CET

Hi Stefan

> Bug reports should be sent to this mailing list. We then may ask
> further questions and finally if we can reproduce it we either
> * fix it immediately
> * or file an issue in our issuetracker

I'm lucky enough to get 3-5 patches a day for the project on good days,
unfortunately many of them are created by TortoiseSVN and the vast majority of
those don't work when applied in linux. Here's the latest patch created in
TortoiseSVN that will not apply in linux:

http://trac.seagullproject.org/attachment/ticket/193/patch3.patch

Here's the output I get:

[demian@localhost trunk]$ patch -p0 --dry-run < patch3.patch
(Stripping trailing CRs from patch.)
patching file modules/navigation/classes/CategoryMgr.php
Hunk #1 FAILED at 146.
Hunk #2 FAILED at 159.
Hunk #3 FAILED at 213.
Hunk #4 FAILED at 263.
4 out of 4 hunks FAILED -- saving rejects to file
modules/navigation/classes/CategoryMgr.php.rej
(Stripping trailing CRs from patch.)
patching file www/themes/default/navigation/categoryMgr.html
(Stripping trailing CRs from patch.)
patching file www/themes/default/navigation/categoryReorder.html

The same applies perfectly using TortoiseSVN's right-click 'apply-patch' feature.

patch submitter's environment
=============================
OS: windows XP
TortoiseSVN 1.2.6, Build 4786 - 32 Bit
Subversion 1.2.3,
apr 0.9.6
apr-iconv 0.9.5
apr-utils 0.9.6
berkeley db 4.3.28
neon 0.24.7
OpenSSL 0.9.8a 11 Oct 2005
zlib 1.2.3

patch committer's environment
=============================
OS: 2.6.14-1.1637_FC4smp (fedora core 4)
patch: 2.5.4
svn: 1.2.3 (r15833)

> But: TSVN uses svn_client_diff() to produce the patchfile. So if
> different TSVN versions give you different results, then look in the
> TSVN about box for the Subversion version number and report the issue
> to the Subversion mailing list.

I can see your line of reasoning but I don't think it's an svn issue, all
patches created on linux with svn client work fine. I'd like to point out for
reference that running a dos2unix on the patch does not help. Also I find it
hard to believe no other project are reporting similar probs, I don't think I
have an unusual environment.

If you could CC any responses to demian@phpkitchen.com that would be great as
I'm following this thread through Gmane.

cheers and thanks for the feedback.

Demian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Nov 21 12:34:45 2005

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

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