Re: Merge problems

rwkit wrote:
> I *am* using "merge two different trees".

Your posted text indicates differently.
Please post the first line of the progress dialog when you *do* the tree
merge.

> I'm trying 'merge a range of revisions' as a work-around, but I'm
> afraid to use it because I see different sets of versions depending on
> whether I choose SVN Show Log from the explorer or click the Show Log
> button in the merge dialog.
>
> The Show Log button gives me these (an excerpt):
>
> Revision: 5703
> Revision: 5701
> Revision: 5683
> Revision: 5681
> Revision: 5679
> Revision: 5676
> Revision: 5672
> Revision: 5670
> Revision: 5669
> Revision: 5667

> And I get this when I choose SVN Show Log from the explorer (again, an
> excerpt):
>
> Revision: 5696
> Revision: 5686
> Revision: 5685
> Revision: 5665
> Revision: 5641

> Note that the numbers overlap but the same numbers don't appear in
> what should be copies of the same log. Yes I've updated all the
> directories several times. What gives? Why don't I see the same log in
> both places?

check the url of your working copy, and then compare it with the url you
entered in the merge dialog for which you show the log for.
Also, the log in the merge dialog has the "include merged revisions" set
while the log from explorer doesn't.

If you think the log is wrong, also make sure that all your repositories
have different uuids:
http://tortoisesvn.net/node/333

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net