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

[TSVN] TMerge settings

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-21 19:07:15 CEST

Hi Stefan,

As I am updating the help file for TMerge (settings page), I need some
help myself ;-)

Backup original file:
Backs up the WC file, but to where? Does TMerge ever restore it?

Use one-pane view as default:
This only affects diffs, not merges, so maybe change text to
"Use one-pane view as default for 2-file diff"

Show Diff Bar
Change text to
"Show line diff bar"

On the colours page, the groupboxes and colour titles are misleading.
Whitespaces: This actually means 'unchanged text on a line where there
are whitespace differences'.

Two file diff: Removed/Added also appear in 3-file diff.

Three file diff: Empty also appears in 2-file diff.

I suggest having 2 groupboxes:
General ----

Inline whitespace diff ----
   Line with whitespace diff
   Whitespace diff

Maybe have the colour box on the left and the text on the right to allow
more space for longer text.

It's still not completely clear from these revised titles, but I can add
more in the docs.

There is a bug in one-pane view where whitespace diffs are shown. The
two lines appear to be the same in one-pane view, but are (correctly)
shown as different in 2-pane view. See Tmerge1.png and TMerge2.png

There is also a bug in the default colours. If I have never set custom
colours, when I edit a conflict the top 2 panes show conflicted lines in
orange (see TMerge.png). If I go to settings/colours and just click on
OK without changing anything, the conflict colour in the top pane
changes to red.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

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

TMerge.png TMerge2.png TMerge1.png
Received on Thu Jul 21 19:06:51 2005

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.