SVN 1.5.6 - svn: Working copy path '...' does not exist in repository

Hi all,
During merge operation I get the error:
svn: Working copy path 'build.properties' does not exist in repository

That's the context:

 * I have two branches (A and B) and a trunk;
 * I worked on A (moving build.properties) and commit;
 * I've merged branch A in trunk and commit;
 * I've merged trunk in B and commit, for alignment with trunk;
 * I worked on B and commit;
 * I've merged B in trunk, including previous merge. Here I have the error svn: Working copy path 'build.properties' does not exist in repository

If exclude in last step previous merge from trunk, everything works fine, but I have to do it manually (using TSvn), so I can't use my automatic script.
With previous SVN version (1.4) it works.

I use svn, version 1.5.6 (r36142).
Any ideas ?

Thanks,
Andrea

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1612879

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-09 12:59:34 CEST