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

Re: [tortoisesvn] r24360 committed - WhiteSpace-Fix handling:...

From: Oto BREZINA <brezina_at_printflow.eu>
Date: Thu, 13 Jun 2013 21:41:04 +0200

On 2013-06-13 20:57, Stefan Küng wrote:
> On 13.06.2013 09:29, Oto BREZINA wrote:
>> Let me elaborate little bit about posibilities so before next rewrite we
>> will better know what we want to get.
>> * Eols and tailing whites - can be detected on the fly
>> * always asked if detected
>> * always fixed
>> * fixed with or without asking if was ok on load - error introduced
>> by editing in T-Merge, T-Merges purposes in first place is to be
>> diff/merge tool not an edit, so most of this error comes from other
>> sources so will be present on load anyway
>> * fixed with or without asking if was ok on "left" view (not sure
>> about merge)
>> Now if you start to build map of all possibly useful version its quite
>> big thing
>> My favorite would be:
>> Auto fix if it was ok in left, ask otherwise.
> No, auto-fixing without asking is very very bad.
> Just detect and ask if necessary.
>> To make it less complex we may add some notification in view title, or
>> status bar, but it may require lot of processing or very good design.
>> Lets stick we current approach for a while.
>> In spaces and tabs conversion it become even more complex.
>> Your left file may be all space indented and saving file all tabs. Is
>> this correct or not ? In current implementation it is correct as it is
>> self homogeniuos.
> When doing such fixing, the views have to be handled completely
> independent of each other. Why would the left view have anything to do
> with how the right view is saved? Doesn't make any sense to me and IMHO
> would make things just unnecessarily complicated. And if it's
> complicated, the users also won't understand why sometimes it asks to
> fix and sometimes not.
Few months ago you stand on T-Merge is diff tool where right is editable
output and left is source.
I consider left as source thing in MOST cases so can be good source of
expected tab/spaces style.
File on load may be damaged by others editing tools (settings), and
T-Merge as last station before commit can warning you that you are about
to change that style.

This wont solve fixing left file though.
>> And then if you ignore left/load state you need set preferred indentation.
> I also don't understand what you want to do exactly with indentation.
> Fixing space/tabs I understand, but indentation? Fixing that is not the
> job of a diff tool at all because it's basically a formatting change and
> depends on file type, language, ...
Indentation in this context meas use spaces or tabs to indent, sorry if
this was confusing.
> Stefan



To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-13 21:41:10 CEST

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.