Re: Merge problems

rwkit wrote:
> I figured out the problem with the logs. As to the merge problem,
> here's the steps I go though:
>
> Select SVN Merge from the explorer on folder "C:\Development\Production
> \ProdSkewDev"
>
> Select "Merge two different trees" on the first dialog page and click
> next.
>
> On the "Tree merge" page:
>
> In the "From:" box I put URL "svn://10.0.0.3/opt/code/hosts/firewall/
> MC_Software/branches/ProdRelease1" and revision 5414.
> In the "To:" box I put URL "svn://10.0.0.3/opt/code/hosts/firewall/
> MC_Software/branches/ProdRelease1" and revision Head.
> Click next.

That's not really a tree merge: both urls are the same!
In that case, you have to use the revision range merge and specify the
revisions there (5414-HEAD).

Stefan

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