Error when merging.

Hi There,
I am trying to merge a file from trunk to our production branch.
I am using the following command;
svn merge -r 1:head trunk/qry_report.cfm branches/production/qry_report.cfm --accept="theirs-full"

Which is a routine I have followed since starting to use SVN.

However, I am now getting the following error.

svn: '/svn/palcare/!svn/bc/20624/tags/nz/1.5/qry_report.cfm' path not found

I assume, what it saying is;
That the file in trunk has a historical link to a file in tag, but that file at that tag location (Or perhaps even the whole tag), no longer exists in the repository.
The error is sensible enough....

But I am obviously missing something.
How does this effect a merge between a source and destination where the source and destination both currently exist?

As always - thanks for any insight.

Gavin.
Received on 2011-05-06 02:26:05 CEST