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

Re: [TSVN] TMerge settings

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-07-21 19:33:34 CEST

Simon Large wrote:

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

This just renames the original wc file to *.bak before saving the
modified version.

> 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"

Isn't that clear without the change?

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

Done.

> 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'.

But you're not suggesting to use that string there?!

> 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 ----
> Normal
> Removed
> Added
> Empty
> Conflicted
>
> Inline whitespace diff ----
> Line with whitespace diff
> Whitespace diff

Ok, done.

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

There's enough room on the left side if we move the color box to the right.

> 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

I'll have a look. Can you file an issue please?

> 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.

I'll check this too.

Stefan

-- 
        ___
   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
Received on Thu Jul 21 19:34:04 2005

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