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

Re: TortoiseMerge.exe crashes when applying a patch

From: masaru tsuchiyama <m.tmatma_at_gmail.com>
Date: 2007-09-17 03:01:22 CEST

2007/9/16, Stefan Küng <tortoisesvn@gmail.com>:
[...]
> Thanks for the report and detailed reproduction recipe.
> Fixed in revision 10634.

Thank you.
I confirmed that the crash is fixed at
TortoiseSVN-1.4.99.10636-dev-win32-svn-1.5.0dev.msi.

I found bugs.

1. checkout trunk of subversion.
2. get the patch at
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130063
3. apply it by selecting "Apply Patch" and "Patch All"
4. create a patch for the working copy.
=> The error dialog box is displayed. (See the attached screenshot)
(The message means "File 'subversion\include\svn_error.h' has
inconsistent newlines")

Problem1: If the original patch has LF line endings and the changed files
have eol-style and they are set to native, the files become
inconsistent in line endings.

Problem2: I try it with setting "Language" to "English", but the message
is displayed in "Japanese" and is garbled.

I think TSVN must care the value of svn:eol-style when applying a patch.

Regards.
Masaru.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

ERROR_create_patch.JPG
Received on Mon Sep 17 02:57:46 2007

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