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

[TSVN] Merging problem with TABs

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-10-26 12:53:11 CEST


I am merging the changes from one file between 2 branches into my working copy. I only get a small conflict in one line, which I can easily resolve.

Problem is, parts of the file has tabs for indentation in 1 branch only (I know, it's ugly that it's only in 1 branch and only partly, this was an accident).

Those parts are not different between the 2 branches (I have set Tortoise to ignore whitespaces), but still, after the merge, I have those tabs in my working copy. Is this by intention or a bug? I thought, it should only put the changes between the 2 branches into my wc.

If I merge with the command line svn and then edit the conflict with Tortoise, it still happens. So, I suspect the problem is with Tortoise.

Using svn 1.1.1 and Tortoise 1.1.1.



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 26 13:59:59 2004

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.