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

Re: TSVN Diff asserts working base to be empty

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-13 15:20:44 CEST

On 13/07/07, Ulf Zibis <Ulf.Zibis@cosoco.de> wrote:
> Am 13.07.2007 14:13, Andy Levy schrieb:
> > I'm not a TSVN developer, just a user. As far as Subversion is
> > concerned, a change in EOL is a material change to the file.
> > Subversion doesn't understand context (and shouldn't attempt to), so
> > any changed bytes are....changed bytes.
> Yes, Subversion doesn't understand context, but TVSN diff view (alias
> TortoiseMerge) could.
> See how they do this at WinMerge.
> >
> >> <please add my comment to the mailing list>
> >
> Sorry, I've overseen, that I can do it myself by CC-ing it.
> > If you want to have a discussion on the mailing list, please just join
> > it.
> >
> >
> Thanx, but that will be too much traffic I would have to pay, if I would
> subscribe every mailing list where I just want to file 1 bug.

There is no bug here. As Andy said, if you change the line ending the
file is different in Subversion's view. That's what the overlay is
telling you. There is no way to change this behaviour in Subversion
(although you can use svn:eol-style to force a particular line end).

I think the trunk version of TortoiseMerge is more tolerant of
different line endings, but I don't have it installed here to check.
Try a nightly build.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Jul 13 15:20:03 2007

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