How to bring new branch file into trunk?

[Markus Dehmann <ma...@gmail.com>]

I have a branch with a bunch of files. Two of these I want to merge
into the trunk:
new.txt and old.txt. The problem is that new.txt does not yet exist in
the trunk.  It was newly created in the branch.

I changed to my working copy of the branch and tried the merge
command, described here
(http://svnbook.red-bean.com/en/1.1/re16.html):

svn merge -r 1685:HEAD file:///path/branches/myBranch/old.txt
svn merge -r 1685:HEAD file:///path/branches/myBranch/new.txt
(1685 is the revision in which the branch was created)

It works for old.txt, but not for new.txt.

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?

Markus

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: How to bring new branch file into trunk?

["Martin A. Brooks" <ma...@hinterlands.org>]

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