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

Various fixes in TMerge

From: Kloster Oddvar <Oddvar.Kloster_at_sintef.no>
Date: 2007-11-19 11:25:33 CET

I've encountered a few bugs and inconsistencies in TMerge and
tried to fix them in the enclosed patch. The changes are as

 * Showing filenames in tooltip for single view header, not
   just the window titles twice
 * Undo functionality:
   - Undo history is now cleared when views are loaded (on open,
     reload or single/double view)
   - Undo history is not cleard on save. Thus it's possible to
     undo changes from before the save.
   - The changed mark (*) correctly indicates if the file has
     changed from last saved version (...well, almost. To be
     precise, it indicates whether we've used undo on all the
     changes since the last reload/save, and not more)
   - Undoing a paste operation is *much* quicker now since we
     don't update the views for every char.
   - Undo would always scroll to put the caret at the top of
     the screen. Now, the views scroll only if necessary to
     make the caret visible.
 * Moving the caret to start/end of conflict block on next/prev
 * Fixed crash if lines were deleted in right view while caret
   in left view was near bottom of document
 * Moving the caret up or down (by kbd) shows line diff for the
   new line (instead of the line under the mouse pointer)
 * Resetting more data in LoadViews() to avoid problems if two-
   way view is opened first and then a three-way view or vice versa.

Another thing I'd like to do is to get rid of the 'current diff
block', i.e. the pair of solid lines that you can move around
using F7/shift-F7. Instead, I'd like to keep just the selection
block and move it around instead.
* As it is today, it is possible to have both a diff block and
  a selection block outlined at the same time, and this has had
  me confused regarding for which block I'm actually asking to
  use the other file's text.
* The diff block does today serve as a cursor: if you go away to
  another part of the document and then press F7, the diff block
  and caret will jump to the next difference relative to the current
  diff block, and not relative to the caret. I find that most often
  (always?) I'd like to go to the prev/next diff from the caret
So the idea is to kick out the diff block and only use the
selection block. Next Diff sets the selection block to the next
difference after the current selection block, or to the next
difference after the caret if there is no selection.


(For the record, the name is Oddvar Kloster, and not the other way
around, as put by the company standard.)

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Mon Nov 19 11:25:50 2007

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.