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

Re: [T-Merge Bug] After commiting changed file, reload leads to empty panels

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 28 Jun 2012 20:28:58 +0200

On 28.06.2012 13:20, Oto BREZINA wrote:
> Diff changed files. Commit it without closing T-Merge. Go to T-Merge
> window. You are asked if you wish to reload. Reload.
> Now you get error, about missing file, panels are empty, but coloring is
> preserved.

I can fix that the coloring changes.
But the rest is by design.

> I would expect to see comparision of new BASE and WC version of file.
> If it is not possible. Do not ask about refresh.
> After manual refresh. Show error and really empty panels - maybe one
> empty and one with WC file?

TMerge is a diff tool. It does not know that you're comparing WC to
BASE. All it knows are two files.
The reload dialog should not show up if the file has gone missing. Not
sure why it does: GetFileAttributesEx() should fail if the file doesn't
exist anymore.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2973767
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-28 20:29:06 CEST

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.