Re: TortoiseMerge behaviour + an error

mika.karkkainen_at_tietolaite.com wrote:
> Hi,
>
> I've got two issues here;
>
> #1 TortoiseMerge runs with the /merged: switch pointing to a temporary file,
> under the .svn directory.

That's not really a problem. The svn library creates that temp file
anyway, we're just using it instead of creating yet another temp file
for the same purpose.

> #2 TortoiseMerge fails with error "Repository moved permanently to ..."
[snip]
> Now, if I:
> 10 resolve the conflicts (picking only the rev 6 stuff)
> 11 save the Merged file and exit TortoiseMerge
> 12 Click Resolved =>
>
> The only thing that changes in the actual target .cpp file, is the time stamp and
> the Merged file happily remains under .svn ..

Fixed in revision 11838.

> The error message of #2 occurs, if I, in step 2 above, select the target file
> instead of the WC's root folder and try to merge the file.

This only happens if you mix merging files and directories: you either
right-clicked on the file and selected the url to the root for the
merge, or you right-clicked on the wc root and selected the url of the
file for the merge.
Otherwise, I don't get an error at all when trying to merge the file only.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org