Re: [TSVN] Merging problem with TABs

On Tue, 26 Oct 2004 13:26:12 +0200, Thomas Börkel <tbo@ap-ag.com> wrote:
> > Because you're merging something in. And by doing that, you want the
> > changes merged in your working copy. That's why the 'other' file has
> > priority over your working copy file.
>
> 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'.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org