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

RE: [TSVN] TMerge line-end bugs

From: Peter Yamamoto <peter.yamamoto_at_page44.com>
Date: 2004-11-06 01:40:26 CET

"
 In the meantime, try the next nightly build and the new graphs from the
log dialog ;)
"

I just grabbed the nightly build and don't see a graph option?

Peter
-----Original Message-----
From: SteveKing [mailto:steveking@gmx.ch]
Sent: Thursday, November 04, 2004 11:41 AM
To: dev@tortoisesvn.tigris.org
Subject: Re: [TSVN] TMerge line-end bugs

Simon Large wrote:

> I have just encountered 2 problems with TMerge.
>
> 1. I made some changes to a file, diffed with the base copy and
> decided to "use this text block" for one line, to revert that line to
> the base copy. When I saved the file I found that all my line endings
> were converted from CR-LF to LF. TMerge has 'ignore line endings'
turned on.
> The
> file's eol-style is native.

I'll have a look at that this weekend.

> 2. I changed a single character in 1 line of a text file. I then used
> TMerge to diff with the base copy with TMerge's 'ignore-line-ending'
> setting turned off. In that case it shows me that _every_ line in the
> file differs.

Sure. The base copy always has LF lineendings. And therefore every line
is different (has a different lineending) than the one in your working
copy.

In the meantime, try the next nightly build and the new graphs from the
log dialog ;)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Nov 6 01:40:37 2004

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