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

Re: [T-Merge patch] syncing code for views

From: Oto BREZINA <otik_at_printflow.eu>
Date: Fri, 08 Apr 2011 22:09:57 +0200

On 2011-04-08 21:00, Stefan Küng wrote:
> On 08.04.2011 00:23, Oto BREZINA wrote:
>> Part4:
>> Introduce and use ResetUndoStep, SaveUndoStep and m_Allstate to handle
>> undo step build time
>> BaseView: Use HasSelection() where applicable
> Some comments:
> * doesn't compile
I don't have VC, so that was bit expected. I thought to buy it, but it
is too expensive to use that occasionally. All I have is T-Merge :)
> * style is wrong ( "{" on same line instead of the next line, ...)
we use that one, so sorry, I know you have only few requerement for
patch and this is one of them :)
reference:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2587752

> Just when I thought you're ready for commit access :/
I thought to ask you for it, but only for poChecker - code changes
become quite big.
I like to use pair programing especially with code "owner"/main maintainer.
> I fixed, modified it slightly and committed it in r21127.
I hope I do more work then make(prepare for you) :)

I missed that dynamic_cast is needed, do you know about its overhead?
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
possible.

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,
CBottomView::UseMyTextBlock.
Also in two-panel view are BuildAllScreen2ViewVector()
RecalcAllVertScrollBars() calls missing.

> Stefan
>

-- 
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2718213
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-08 22:18:34 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.