[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: Oto BREZINA <otik_at_printflow.eu>
Date: Fri, 29 Jun 2012 20:46:32 +0200

On 2012-06-28 21:18, Oto BREZINA wrote:
> On 2012-06-28 21:12, Stefan Küng wrote:
>> On 28.06.2012 21:02, Oto BREZINA wrote:
>>
>> Settings->Diff Viewer->Convert files when diffing against BASE.
>> If you uncheck that, then the diff is done against the pristine file in
>> the .svn folder directly. But: that pristine file has LF eols and no
>> keywords expanded.
> TNX will try. Keywords are not a problem, but eols could be (I guess
> only when svn:eol is set, anyway) will see.
( Did not update from last time ... )
Not expanded Keywords are fine, even It took some time to get it.
Not sure about eols. I have CL RF both in left (BASE) and right (WC).
svn:oel is not set. So this is fine too.
However this does not solve my issue. After committing T-Merge shows
still same difference.
If I change Change WC file new changes are reflected in view correctly,
but it seems pristine filename changes on commit thus I'm comparing with
old BASE.
So it does not solve my issue.

Can Commit dialog close T-Merge for file it opens after they was
committed, or better update left compare side?

>> Stefan
>>

-- 
Oto BREZINA
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2973993
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-29 20:47:23 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.