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

Re: Ignore Whitespace bug?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-04-12 09:31:19 CEST

On 4/2/07, Thomas Börkel <tbo@ap-ag.com> wrote:

> I am merging a file with 2 changes into my working copy. The first one
> is just a SPACE, but not at the start or end of the line and the second
> change leads to a conflict:
> @@ -1,3 +1,3 @@
> -sdfsdf sdfdsf sdfsdf sdfsdf
> +sdfsdf sdfdsf sdfsdf sdfsdf
> sdfsd sfsd fsdf dfg dfg dfg
> -dfgdsf dfg dfg sjw fdgidfg dfgoi
> +dfgdsf dfg dfg sjw fdgidfg dfgoix
> Now when I look at this in the conflict editor and I have ignore
> whitespaces ON, then I see the SPACE change in the upper left window
> part, but it is not marked. Then I resolve the conflict and save. Then
> the SPACE change is lost.

Of course it's lost. If you *ignore* whitespaces, you shouldn't be
surprised if they're really ignored, also when saving. TMerge ignores
the whitespaces, so for TMerge it's irrelevant from which file it
takes the line to save.

> I thought that ignore whitespaces only ignores whitespaces at the
> beginning or end of the line?

Where did you get that from?

> And if not, it is still fatal that this change gets lost during conflict
> editing.

No, it's not. You've told TMerge to ignore whitespace changes, so it
can save it however it chooses.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Apr 12 09:31:50 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.