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

Re: TortoiseMerge bug: Deletes and changes lots of lines not in the diff

From: Dirk Traulsen <dirk.traulsen_at_lypso.de>
Date: 2006-07-24 09:34:14 CEST

Am 18 Jul 2006 um 18:51 hat Tobias Schäfer geschrieben:

> I can reproduce this with TortoiseMerge 1.3.5. But it works ok with > the latest version from trunk. So this got already fixed.

That's fine. But leaves me with the same problem. Before you wrote:

> You might want to try a nightly 1.4.0-dev build but take care: the working
> copy format will be silently updated to a new format and cannot be read by
> a 1.3.x client.

So updating to 1.4.0-dev is not an option for now.
What shall I do? As this is a quite harsh bug, will there be a 1.3.6?
I used TortoiseMerge for at least hundreds of diffs in the last weeks
before I found the bug, so there are lots of possible errors. Do I
have to throw away everything or can you narrow it down a bit. What
is the problem here? What kind of file is affected?

Dirk

PS.: I follow the thread on Gmane or haxx, as I'm not on the list,
but for convenience please cc me.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 24 09:39:44 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.