Re: How to bring new branch file into trunk?

Markus Dehmann wrote:

>svn complains that new.txt does not exist in the trunk and says: use
>--force to override this restriction. But actually, I get the same
>message when I actually use svn merge --force ...
>
>What is the recommended way to do it?
>
>

The error you've described seems logical to me. How about copying (svn
cp) the file from the branch to the trunk? The history will be maintained.

Regards

Mart.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 16 23:37:38 2005