Reduce code duplication in T-Merge views
On 2011-04-09 09:17, Stefan Küng wrote:
> On 08.04.2011 22:09, Oto BREZINA wrote:
>> On 2011-04-08 21:00, Stefan Küng wrote:
>> I thought to ask you for it, but only for poChecker - code changes
>> become quite big.
> Just send me your google account name and I'll set you up.
> But you have to make sure that every commit compiles properly - bugs can
> be fixed later, but if the compile fails, the nightly builds also fail
> and that's not what I want.
htcotik - at least I think .. :) it is only for TSVN (and my phone) :D
I will not commit anything but poChecker (unless you send me free VC2010
copy :D )
>> All (most of) that function can be moved to parent class, but it become
>> a big mess, so I like to keep their place just remove duplicates if
> I thought the same when I had to fix this. The bottom view class is
> really the best place for this.
In this patch I still kept location as it. Duplicates has been resolved
to pulling class (as you can see).
>> This also lead me to question:
>> CLeftView::UseFile handle DIFFSTATE_CONFLICTEMPTY as special state to be
>> resolved into DIFFSTATE_CONFLICTRESOLVEDEMPTY, unlike
>> CRightView::UseFile, CBottomView::UseTheirTextBlock,
> Fixed CRightView::UseFile in r21132, but in CBottomView those states are
> already handled properly?
Even my comments are buggy, CBottomView method should be on left side in
that sentence ...
Oto BREZINA, Printflow s.r.o., EU
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-09 15:52:47 CEST