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

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

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-10-25 18:39:28 CEST

Roel Harbers wrote:
> 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
> screenshots)

Fixed in revision 1862.

> 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.)

Since that box is greyed out, it doesn't really matter what's showing in
there - it's not used.

> 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.

Yes, it's not updated with the FROM: url. I changed that in revision
1862 too.
If you click on "use from url" checkbox, then the string in the url
combobox gets copied over to the "to" url.

> 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
> identical.

The merge actually will work ok. It's just the UI which shows sometimes
the wrong urls.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 25 19:49:46 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.