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

Re: Creating and applying a patch [BUG found?]

From: Wayne <wayne_at_zk.com>
Date: Thu, 20 Mar 2008 14:05:55 -0700

Kevin Grover wrote:
> On Thu, Mar 13, 2008 at 2:38 PM, Wayne <wayne_at_zk.com> wrote:
>
>> Nicolas Alvarez wrote:
>> > Wayne escribió:
>> >> I guess that I was not clear (my description assumed that newlines
>> >> are line terminators.)What I should have said is that they had an
>> >> extra EOL. I think that this is what you are trying to say above.
>> >
>> > So in other words, there were two EOLs (instead of only one as usual)
>> > at the end of the file?
>> >
>> >> However, just for good measures I added 4 consecutive EOLs to the end
>> >> of a file and repeated the experiment. The patched file now has 5
>> >> EOLs in it.
>> >
>> > Good idea making that experiment... Sounds like an actual bug then;
>> > but I can't test it myself right now.
>> >
>> Can anyone else verify this? I just tried another set of files and one
>> or two did not have the extra EOL.
>>
>> Also, I am not as familiar with the svn command line tool. Does anyone
>> know that commands to do the equivalent with it of the top of their
>> head? If not I'll have to wait until next week to figure it out.
>>
>>
>>
>>
>
> To create the patch, use svn diff:
>
> 'svn diff > blah.patch'
>
> You'll need the patch command to apply it:
>
> 'patch -p0 < blah.patch'
>
> You can get a Windows exe for patch from http://UnxUtils.sf.net (or
> MSYS, or Cygwin)
>
>

Okay, the svn diff > ... command creates exactly the same patch as the
context menu. This is not at all surprisings since I assume that the svn
library is handling the command in both cases.

The first time I tried to run "patch -p0 ..." command failed because,
for some reason, patch believed that some of the changes have already
been applied.

I tried a different set of changes today on two identical working copies
using both tsvn and patch. TSVN added and extra EOL to the end of the
file and path did not. Also, I think I have noticed that if you modify
the last line of the file the extra EOL is not added. I don't have time
right now to verify that.

Can someone else give this a try and verify my results. All you need to
do is create a patch from a modified working copy and apply it to a
non-modified working copy and you'll see an extra EOL at the end of each
patched file. I think but have not confirmed that if the last line in
the file changes the extra EOL is not added.

Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-03-20 22:06:14 CET

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.