Re: TMerge undo and other questions

Simon Large wrote:

> In TMerge if I make some changes (use this block) and save, then realise
> that the last one was a mistake and undo it, the save button is still
> greyed out so I cannot re-save the file with the correction.

Fixed in revision 8301.

> Is there a limit to the number of undo levels, or is it just memory
> limited?

only memory limited.

> It might be more intuitive when undoing a change if the current line
> jumps to the site of the undo. ATM if I select 'Undo' I cannot see the
> result of what I undid without searching for it.

Done also in revision 8301.

> Should there be a 'redo', possibly for one level only? Common practice
> (for me) when I am not sure how many changes I need to undo is to keep
> undoing until I get to one I want to keep, then redo that last one.
> /me running and hiding

Your last line indicates that you know how I see that :)

> In the current nightly version of TMerge I cannot see added and deleted
> blank lines properly. Even with the 'compare white spaces option',
> deleting a blank line results in a 'whitespace-only change' blob in both
> panes. The only way to tell whether space was added or removed is by
> looking at the line numbers. And if I 'use other text block' then I
> cannot tell at all because the line numbers are not recalculated. Two
> issues here:
> 1. adding and deleting whole lines should perhaps be treated differently
> from adding/deleting space within a line, at least in compare whitespace
> mode.

Done in revision 8303.

> 2. When two blocks are made equal using 'use this text block', could
> they perhaps be marked using an '=' sign on both sides, rather than
> +/-/O to show that the difference has been removed? ATM I get a
> whitespace-only change mark appearing, when there is really no
> difference at all. The alternative (showing no mark at all) loses the
> fact that there is a difference in the file content which has just been
> removed.

Done in revision 8304.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org