Hi there,

I have a question about completely overwriting a destination file with a merge.
I have been doing;
svn merge -r1:head trunk/somefile branches/somefeature/somefile

As long as I continue to choose "Their File" for any / all conflicts;
My question is - will this actually give me a complete / accurate copy of the 
trunk file in the branch location?

Is this the correct method to achieve what I want?

As a point of discussion - as opposed to a solution - would it not be an easier 
solution for (me) the end-user for this process to be simply replaced by 
allowing the --force switch to be used with svn copy?
Of course  - I would expect SVN to internally handle the mergeinfo changes 
required for the destination path.

Or am I just just doing it wrong - and there is already a simpler solution?


Gavin "Beau" Baumanis

Reply via email to