Re: [TSVN] TMerge can't save file when diffing

On Tue, 21 Dec 2004 11:59:35 +0100, Martin Eckardt
<Martin.Eckardt@micronova.de> wrote:

> I did exact the same, but on several files in several working copys. I
> just tried it on TortoiseSig.txt and it's working ok.
>
> Hehe, just tried again on a test repos. It's very tricky.
>
> Try to delete some lines and do "use this text block" from the left side
> to add this lines again to the working copy. now exit and save. edit the
> file or do diff again: The lines aren't in.

I see now where you have trouble: if you do that, then the line in the
right view is gray, which means it is 'empty'. That's why it isn't
saved.

Fixed in revision 2182.

> BTW Stefan, did you recieved my crash report about the branch/tag
> dialog? (I sent it to your gmx.ch account)

Yes I did. Problem is: I don't have the debug symbols for the nightly builds.
I try to reproduce the problem according to your description this
evening though.

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