Re: TortoiseMerge tries to save changes into temporary file

Alexander Klenin wrote:
> TortoiseSVN 1.4.3, Build 8752 - 32 Bit -dev,
>
> What I did:
> 1) From "Show log" dialog, select a revision which changed a file
> 2) Double-click on the changed file to show diff in TortoiseMerge
> 3) Right-click a changed line on the left pane, select 'Use this text
> block' from context menu
> 4) Press "save changes" button.
>
> What happened:
> "Could not open the file <temp_file_name>" error message displayed,
> "Save changes" button disabled, nothing actually saved to disk.
>
> What I expected:
> There are several related but separate issues here, I think:
>
> 1) If error happens during saving, changes should not be marked as
> saved. Better yet "Retry, Abort, Ignore" - type dialog should be
> displayed.

Fixed in revision 8865.

> 2) If the TortoiseMerge knows it can not save changes, it should not
> allow used to make them.

if the file is readonly, TortoiseMerge will now automatically do a "Save
as..." instead of trying to write to the readonly file.
(revision 8862)

> 3) Ideal solution would be if TMerge attempted to save changes to a
> working copy, however I understand that it is not a trivial feature.
> If developers think this idea is worth implementing (for at least
> filing an issue), I shall be happy to provide my thoughts about its
> design.

Since we're dealing with temp files here, we can't just overwrite files
in the working copy. You have to do that manually by using "Save as..."

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