On Wed, Nov 17, 2010 at 11:00:25PM +1100, Gavin Beau Baumanis wrote: > 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? >
It will as long as you choose "theirs-full", but only for conflicting files. Note that you could also use the --accept="theirs-full" option to skip the interactive prompt. > Is this the correct method to achieve what I want? That depends. Could you describe what problem you're trying to solve, really? You've explained the way you're trying to solve the problem. But what got you into this situation in the first place? Merging into the file directly will create subtree mergeinfo, which you might want to avoid. Stefan
