[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: Bruno Bigras <bruno_at_burnbox.net>
Date: Thu, 21 Aug 2008 15:55:15 -0700 (PDT)

I also have this problem.

"Show differences as unified diff" in "Check for modifications" work
fine. But "Create unified diff file" in TortoiseMerge result in an
empty (0 byte) file.

The encoding is "ASCII LF / -1" and "ASCII LF / +1".

TortoiseMerge 1.5.2 Build 13595 - 32 Bit , 2008/07/31 17:04:57
libsvn_diff 1.5.1
apr 1.2.12
apr-utils 1.2.12

Same thing with 1.5.1 and 1.5.0.

On 20 aoŻt, 12:11, Stefan KŁng <tortoise..._at_gmail.com> wrote:
> Absynthe wrote:
> > When I do a merge between 2 files and I try to create a unified diff
> > file, the file created is empty.
>
> Works for me just fine.
>
> * is the file really empty (0 bytes)? Or maybe just the diff?
> * what's the encoding of your files (shown in the bottom right statusbar)
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-22 00:55:22 CEST

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