On 28.06.2012 21:02, Oto BREZINA wrote:
> On 2012-06-28 20:28, Stefan Küng wrote:
>> 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.
> Besides coloring.
> I use T-Merge for checking file to commit. Sometimes I need to remove
> changes a divide them commit into 2-3.
> After commit commited file is replaced by backup and next change set is
> checked. In this process more files and so T-merge are involved.
> Removing error is help, but keeping showing BASE-WC will be even better.
>
> As possible work around could be use files directly from .svn dir ...
> nasty but ...
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.
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=2973782
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-28 21:12:45 CEST