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

RE: Re: TMerge: fixing inconsistencies on save

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 11 Jun 2013 12:20:00 -0700 (PDT)

On 10.06.2013 23:14, Oto BREZINA wrote:> On 10. júna 2013 20:05, Stefan Küng wrote:
>> The new feature about fixing inconsistencies when saving in TMerge looks promising. But I have a few suggestions:
> THX :) Maybe candidate for exception a feature added to stable branch :)
> BTW: there is no 18x nightly - intentional ?

there's a full one now.

>> * 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
> we can also use "radio checkbox" only one can be checked, other one get
> unchecked once other is clicked(checked).

That's what I meant with radio button :)

> It was all day work to design and make this dialog work. My first dialog
> in VS. So I'm not sure how to handle events, radios etc - I just copied
> Encoding Dlg and tweak it. But I will see what I can do to get most of
> it in next two days.
>> * always ask if there are inconsistencies, no matter what the state was on load
> So you are suggesting to don't remember on load status. It is so?
> Actually using this feature a little I found out that you may start with
> edited file (e.g from IDE) which is broken already and thus on load
> status is not what you want to get, so I can only agree.
> However whole idea about keeping original state and ask what to fix only
> when new incosistency was introduced is to be not that much talkative.
> File you are editing may be "broken" for a reason.
> E.g. all .rc have spaces on line end. End editing such file will
> "always" ask if you want fix it.
> Seems we never cover all possibilities ideally.

maybe we can just add an exception for rc files then?

> You then mean: Show "what to fix dialog" if:
> * there are whites in file end

this we could leave with the on-load check.

> * multiple EOLs are used

this we should definitely not make depending on the on-load state, at least not for ascii/utf8 encodings: if the svn:eol-style is set then a commit for such files will fail if it has inconsistent line endings.

> * spaces AND tabs can be converted

that too can be left dependent on the on-load state.

> Especially first can happen quite often, Second and third seems be as
> errorious case, but possibly ok.

At least for ASCII/UTF8 encoded files, the dialog should always be shown if the EOLs are inconsistent.

> I will implement it this way and we will see.
>> 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.
> Right, there is map stored in regs so you can disable checks. Adding
> forced fix can be done similary.
> It can be settings directly or this one can be reused with little tweaks
> - accessible from settings as well as from "what to fix" dialog.
> So we get three regs.
> * feature on
> * force fix map - no question
> * ask if found map
> The Tab2Sp vs Sp2Tab is little trickier, but can be solved.
> Do I catch it right?

Yes, that's right.



To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-11 21:20:03 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.