Login | Register
My pages Projects Community openCollabNet

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

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

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

Author otik
Full name Oto BREZINA
Date 2011-04-09 06:50:02 PDT
Message Attached part5
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
>> possible.
> 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_CONFLICTRE​SOLVEDEMPTY, unlike
>> CRightView::UseFile, CBottomView::UseTheirTextBlock,
>> CBottomView::UseMyTextBlock.
> 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
Attachments

« Previous message in topic | 16 of 27 | Next message in topic »

Messages

Show all messages in topic

[T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-04 13:57:21 PDT
     Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-05 11:03:39 PDT
         Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-05 14:10:14 PDT
             Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-06 09:26:00 PDT
                 Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-09 12:54:25 PDT
             Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-06 15:12:10 PDT
                 Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-07 10:16:41 PDT
                     Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-07 12:03:24 PDT
                         Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-07 12:42:35 PDT
                             Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-07 13:20:49 PDT
                                 Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-07 13:30:40 PDT
                                     Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-07 15:23:20 PDT
                                         Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-08 12:01:02 PDT
                                             Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-08 13:10:05 PDT
                                                 Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-09 00:17:09 PDT
                                                     Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-09 06:50:02 PDT
         Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-17 00:31:07 PDT
             Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-17 02:46:45 PDT
                 Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-05-11 13:54:50 PDT
                     Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-05-12 12:52:58 PDT
     Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-10 02:14:27 PDT
     Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-10 02:15:30 PDT
         Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-10 12:08:55 PDT
             Re: [T-Merge patch] syncing code for views steveking Stefan Küng 2011-04-10 12:14:39 PDT
                 Re: [T-Merge patch] syncing code for views otik Oto BREZINA 2011-04-10 12:22:04 PDT
Page: of 2 « Previous | Next »
Messages per page: