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

Re: [TSVN] empty lines added by TMerge

From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-09-22 13:59:02 CEST

SteveKing wrote:
> On Wed, 22 Sep 2004 13:07:06 +0200, Roel Harbers <roel@roelharbers.nl> wrote:
>
>>Just try the recipe. They ARE saved to the file.
>
>
> Or: you could send me the four files in question.

Good point.

> Reproducing that
> here at work would mean to first set up a repository where I can test
> things...

Sorry, I assumed you would have a test repo for that kind of thing.

>
> What are your settings regarding whitespaces in TME?

I can't remember ever changing those from the default, but here they are:

View->Whitespaces is off,

Ignore Lineendings is on
Compare Whitespaces is selected

Any other settings you need?

(I just tried it with "ignore Whitespaces" selected: same result)

Regards,

Roel Harbers

first line
y1
y2
y3
y4
last line

first line
last line

first line
x1
last line

first line
<<<<<<< .mine
y1
y2
y3
y4
=======
x1
>>>>>>> .r3
last line

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Sep 22 15:05:58 2004

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