[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

SVN merge, Error: File not found: revision

From: Bhardwaj, Anil K <ABhardwa_at_sovereignbank.com>
Date: Thu, 30 Oct 2008 21:40:27 -0400

Subversion 1.5.3 (OS Windows 2003 server) - build server
Tortoise SVN 1.5.4 (OS Win XP) - working copy of trunk
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
Only see revision 258, followed by 847, and above.
Branch too shows the same.
Error message
Command: Merging revisions 1-HEAD of
ndationDataDesign/DDL Scripts/reference-tables-script.sql into
C:\Documents and Settings\ABhardwa\My
Scripts\reference-tables-script.sql, respecting ancestry, Test Only
Error: File not found: revision 846, path
'/FoundationDataDesign/trunk/DDL Scripts/reference-tables-script.sql'

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.
Received on 2008-10-31 23:23:06 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.