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

Re: [TSVN] Edit Conflicts and Ignore Whitespace

From: Simon Large <slarge_at_slarge.plus.com>
Date: 2005-05-22 22:36:59 CEST

Josha Foust wrote:
>> I have run into a bit of a problem with the "Ignore Whitespace"
>> options in TortoiseMerge. If you have one of the two options set
>> and then do an update that creates a conflict because of whitespace,
>> TortoiseMerge won't show you the conflict at all.
>>
>> I imagine this applies to all versions since the introduction of the
>> ignore whitespace options, but I have noticed this behavior in a few
>> different nightly builds over the last month or so.
>>
>> I think it would be optimal if you could leave the ignore whitespace
>> option on for most of the file, but still see the differences in the
>> conflicted areas.
>>
>> Thanks,
>> Josha Foust
>>
>
> Has anyone looked into this?

Added to the issue tracker as issue 88, so we don't forget about it.

Simon

-- 
       ___
  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
Received on Sun May 22 22:36:14 2005

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