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

[TSVN] Merge dialog shows incorrect wc url after dry run

From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-10-25 10:29:46 CEST

When I try to merge changes from the trunk into a branch, and do a
dry-run first, the wc url shown in the merge dialog changes to the trunk
url instead of the branch it really is (Marked with red, see attached

Also, before the dry-run, the (grayed-out) TO: url is the url to the
branch, NOT the trunk as I think it should be (since trunk is the FROM:
url, and I have "Use from: url" checked) (marked with blue.)
First I thought this field was just not updated with the FROM: url when
cheching the box, but I tried to set it to the correct trunk url
manually first, and then checked the box, and it actually changed my
trunk url to the branch url in the (grayed out) box.

The merge does seem to go ok though, but that might be because there
were no changes in the branch since the copy, so both urls are really

(tsvn v1.1.1.1857 on WinXP-SP1)


Roel Harbers

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

before_dry-run_edited.jpg dry-run.jpg after_dry-run_edited.jpg
Received on Mon Oct 25 15:49:45 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.