Re: Merge problems

rwkit wrote:
> My url is:
>
> svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
> version:
>
> 5628
>
> Command:
> Merging revisions of svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
> into C:\Development\Embedded\JazzRelease, respecting ancestry, Test
> Only
>
> I use the default settings of Compare Whitespace.
>
> I am *pretty* sure that the merge was working before the upgrade. If
> there is a possibility of a server issue, I'll need something to pass
> on to the server guy, something to try or look for, or he's not going
> to be much help.

You're using the 'merge a range of revisions', but you haven't specified
any revisions to merge.
Either specify the revisions you want to merge, or use 'merge two
different trees'.

Stefan

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