SVN merge, Error: File not found: revision

["Bhardwaj, Anil K" <AB...@sovereignbank.com>]

Hi,
 
Environment
------------------
Subversion 1.5.3   (OS Windows 2003 server) - build server
Tortoise SVN 1.5.4 (OS Win XP) - working copy of trunk
 
Scenario
-------------
Created a branch from trunk. 
Plan to do merges only from branch to trunk, and not vice versa.
So used svn merge and not svn merge --reintegrate
 
Created a working copy from a project in trunk.
Merged a particular file "reference-tables-script.sql" from branch. Used
"Test merge" option of Tortoise SVN.
Got following error.
On trunk when I do a listing of revision history I do not see revision
846.
Only see revision 258, followed by 847, and above.
Branch too shows the same.
 
Error message
---------------------
Command: Merging revisions 1-HEAD of
svn://<IP_address>/Repository/FoundationDataDesign/branches/00_04_01_Fou
ndationDataDesign/DDL Scripts/reference-tables-script.sql into
C:\Documents and Settings\ABhardwa\My
Documents\Anil\Subversion\Merge\Branch\00_04_01_FoundationDataDesign\DDL
Scripts\reference-tables-script.sql, respecting ancestry, Test Only  
Error: File not found: revision 846, path
'/FoundationDataDesign/trunk/DDL Scripts/reference-tables-script.sql'  
Finished!: 
 
Regards
Anil



This message contains information which may be confidential and privileged. Unless you are the addressee  (or authorized to receive for the addressee), you may not use, copy or disclose to anyone the message or any information contained in the message.  If you have received the message in error, please advise the sender by reply e-mail, and delete or destroy the message. Thank you.