[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: Josha Foust <jfoust_at_mankowindows.com>
Date: 2005-05-20 23:43:25 CEST

> -----Original Message-----
> From: Josha Foust [mailto:jfoust@mankowindows.com]
> Sent: Wednesday, May 18, 2005 11:59 AM
> To: dev@tortoisesvn.tigris.org
> Subject: [TSVN] Edit Conflicts and Ignore Whitespace
>
> 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?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri May 20 23:43:45 2005

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.