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

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 18 Apr 2011 18:43:58 +0200

On 17.04.2011 23:21, Oto BREZINA wrote:
> one before last one @ this theme (you must get happy ;) ):
> * Code clean up, shuffle methods to get order in mess :)
> * Reduce code duplication in BottomView
> * recalculate line numbers, remove lines empty in all three views *1
>
> To check this :
> 1. one three-panel view (Schiller'sGlocke)
> 2. select conflicted lines (Bottom view, right click on line 10,11)
> 3. Use both (mine before theirs)
> 4. select newly resolved lines (Bottom view, right click on line 12,13 )
> 5. Use both (their before main)
>
> In previous version empty line start to flood view as repeating operation.

Thanks!
Committed in r21179.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2721093
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-18 18:44:07 CEST

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