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

Completely overwrite a file.

From: Gavin Beau Baumanis <gavinb_at_thespidernet.com>
Date: Wed, 17 Nov 2010 23:00:25 +1100

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
Received on 2010-11-17 13:01:14 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.