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

Bug in Merge

From: <snigg_at_gmx.net>
Date: Thu, 17 Dec 2009 16:25:13 +0100

Hello,

first I am sorry if I do something wrong. This is my first Mailing List post and I am not a native english speaking person.
I believe I found a bug in the Tortoise-Merge (Version 1.6.6.17493):
I choose Merge -> "Merge a range of revisions".
The revision range I leave empty so it should merge all changes. Then I press Merge. And now the "Resolve Conflict" window occurs. I always press "Use repository". So in the manual is described svn will take the file of the repository. But what it do is to merge it with my working copy! This behavior is repeatable.

If I press "Resolve later" so it generates a left and right file with the correct content.

Can somebody confirm this behavior. I thing it is a bug or a mistake in the manual.

Thanks

-- 
GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT!
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431218
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-17 16:34:36 CET

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