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

RE: [TSVN] Merging problem with TABs

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-10-26 13:46:56 CEST


> > But Tortoise does not recognize these parts with TABs as
> "changed", if I set "ignore whitespace". So, why merge them
> into the wc, if they have not been changed?
> If you ignore whitespaces, the lines are _identical_ for TortoiseMerge
> even if they differ in whitespaces. Now, you resolve the conflicts
> left, and save. But as the 'template' to save TortoiseMerge uses the
> 'their' file and not the 'your' file, because you're merging the
> 'their' file into 'your' file and therefore 'their' has priority over
> 'your'.

I see. Thanks a lot for the explanations! :-)


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 26 14:49:47 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.