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

Re: Bug in tortoise merge

From: Ivan Cenov <i_cenov_at_botevgrad.com>
Date: Fri, 22 Aug 2008 19:30:32 +0300

Hi,

I tried - the result is an empty file.

Windows XP SP3 / TortoiseMerge 1.5.2 rev 13595
Ivan

Stefan Küng написа:
> Bruno Bigras wrote:
>
>> On Fri, 22 Aug 2008 07:32:50 +0200, Stefan Küng <tortoisesvn_at_gmail.com>
>> wrote:
>>
>>> Can you zip two example files which you diff in TortoiseMerge and
>>> produce an empty unified-diff and send the zip please?
>>>
>>>
>> No problem. Have a nice day.
>>
>
> Thanks for the files.
> Unfortunately, when I diff those two files in TortoiseMerge and execute
> "create unified diff", the patchfile is not empty but contains the real
> unified diff.
> So there must be something else which makes the diff fail on your system
> but not on mine. Any ideas?
>
> Stefan
>
>

-- 
Regards,
Ivan Cenov
OKTO-7 Co., Botevgrad, Bulgaria
i_cenov_at_botevgrad.com, imc_at_okto7.com
  GSM: +359 888 76 10 80
phone: +359 723 6 61 20, +359 723 6 61 61
  fax: +359 723 6 62 62
Received on 2008-08-22 18:30:44 CEST

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