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

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

From: Martin Eckardt <Martin.Eckardt_at_micronova.de>
Date: 2004-12-21 11:59:35 CET

SteveKing wrote:

>On Tue, 21 Dec 2004 09:59:34 +0100, Martin Eckardt
><Martin.Eckardt@micronova.de> wrote:
>
>
>>Will Dean wrote:
>>
>>
>>
>>>At 09:42 21/12/2004 +0100, you wrote:
>>>
>>>
>>>
>>>>Hi all,
>>>>can anyone confirm this?
>>>>When I diff a modified file (working Copy) with Working base and do
>>>>some changes to the working copy file (e.g. "Use this Text Block"
>>>>from working base) TMerge don't ask to save the file on exit and if I
>>>>do manually save and exit the changes are gone.
>>>>
>>>>Is this a bug or a nice feature?
>>>>
>>>>
>>>What version (build number)? I might have broken this in the recent
>>>work I was doing.
>>>
>>>
>>>
>>I'm using r2178 the latest nightly.
>>
>>
>
>- modified build.bat (added an empty line, removed another)
>- started TortoiseMerge ('svn diff' context menu on build.bat)
>- did a 'use other text block'
>- clicked exit
>- TortoiseMerge asked me to save first
>- File save as changed.
>
>So: can you describe a little more detailed what you tried to do?
>
>
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.

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 21 12:00:31 2004

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.