Re: [TSVN] Double-click in check for modifications

Simon Large wrote:

> Whilst checking out Lukas's problem I noticed something else in the
> current build. If a file is changed local and in the repo, the check for
> modifications context menu has no entry highlighted. When you double
> click you get a 3-way diff/merge using TMerge, but the bottom pane title
> is 'Merged - (not found)'.
>
> 1. Should there be a (bold) context menu entry for this action?

Are you sure there's no default entry visible? There should be one
visible even if the file is changed locally and in the repo. Although I
haven't tested it yet, the code seems to do exactly that!
Oh, make sure that only one file is selected when you right-click on it
- for multiple files the context menu is different!

> 2. Where is the merged text in the 3rd pane going to?

If you just _compare_ three files, the fourth file (the merge result) is
not specified and will be asked for if you hit the "Save as..."
button/menuentry.

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