[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: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-21 20:56:29 CEST

SteveKing wrote:
> 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.

OK, I'll put that in.

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

Yes, s'pose it is really ;-)

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

Short text is then a long way from the box. But I the boxes are far
enough apart, so it's not really a problem.

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

Off to the issue tracker later this evening, once I have got these
children into bed ...

> I'll check this too.

Two issues for the price of one. Bargain!


   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 20:56:00 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.