On 2013-06-12 22:19, Stefan Küng wrote:
> On 12.06.2013 22:11, Oto BREZINA wrote:
>> On 12. júna 2013 21:39, tortoisesvn_at_googlecode.com wrote:
>>> * never automatically fix: if there is something to fix, always ask first
>> You asked this :)
> I think that was a misunderstanding. I only wanted to always ask to fix
> EOLs, not fixing them without asking.
Here is excerpt from your email "TMerge: fixing inconsistencies on save"
On 2013-06-10 20:05, Stefan Küng wrote:
> The new feature about fixing inconsistencies when saving in TMerge looks promising. But I have a few suggestions:
>
> * instead of deactivating space/tab and tab/space, I would just use a radio button: if there are such inconsistencies always show that radio button and have the user chose what to do instead of trying to figure out what the user might want to do
> * always ask if there are inconsistencies, no matter what the state was on load
>
> this could also be improved so that the settings dialog has options to either never ask to fix a specific inconsistency, or even always fix it without asking (three state: never/always/ask). And this for each of the inconsistencies it can fix.
>
>> I have no access to my machine right now, but reading diif I get
>> feeling, that any indentation will popup fix before save dialog and
>> there will be no default set. In fact the other then actual will be
>> selected or both if mixed.
>> If I'm mistaken just ignore it. I'll have a look tomorrow anyway.
> ok, I haven't checked that.
It works as I expect from code.
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.
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.
And then if you ignore left/load state you need set preferred indentation.
All can be implemented but before that we need be clear what we want.
>
> Stefan
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3057953
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-13 09:29:34 CEST