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

Re: [TSVN] Severe Problem With Tortoise Merge

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-06-22 20:00:00 CEST

gmail@novanix.com wrote:

> It is not only not saving files properly in some situations but it
> actually overwrites previously opened files with the currently opened
> files contents:
>
> open up tortoisemerge open a base file and a your file merge some
> things from theirs into base save reload (changes show up correctly)
> open a different base file and your file without closing out of the
> program merge some changes from theirs to base save reload
>
> Changes are not saved to `your file`, infact they are actually saved
> over the previous `your file`.

Thanks for the bugreport and the detailed reproduction recipe!

Fixed in revision 1260.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jun 22 21:05:36 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.