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

[TSVN] tortoise merge bug?

From: johan laenen <johan.laenen_at_gmail.com>
Date: 2005-05-10 15:00:02 CEST

I'm using

TortoiseSVN 1.2.0, Build 3208, UNICODE
Subversion 1.2.0, -dev
apr 0.9.5
apr-iconv 0.9.5
apr-utils 0.9.5
berkeley db 4.3.27
neon 0.24.7
OpenSSL 0.9.7d 17 Mar 2004
zlib 1.2.1

Whenever I select a file in whatever directory and try a turtoise
merge the From: (start URL) always shows the last file I already did a
merge on, NOT the currently selected file.

At the bottom of the popup however the result of the merge will be
stored in the correct working copy.

p.e.

one directory, in it three files: alfa.txt, beta.txt and gamma.txt, revision 10.

i've already done a beta.txt merge to bring this file back to revision
2. now I want to do the same for alfa.txt. I select alfa.txt but
turtoise merge shows me the path to beta.txt. The result however will
be stored in alfa.txt. This will not work.

Johan Laenen

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue May 10 15:07:09 2005

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.