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

Ignore Whitespace bug?

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2007-04-02 11:39:46 CEST


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.

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

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

Any workaround besides setting ignore whitespaces to OFF?

Using Tortoise 1.4.3 on Windows Vista.



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Apr 2 11:43:25 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.