Re: [boost] svnmerge.py

From: Eric Niebler (eric_at_[hidden])
Date: 2007-12-06 19:01:13

Rene Rivera wrote:
> Essentially I'm only interested in doing what I call a copy-replace 
> operation. That is to make the tree in the release branch, look exactly 
> like the tree in the trunk. To do it you can:
> 
>    cd branches/release/<some-sub-tree>
>    svn merge https://.../.../branches/release/
> 

> https://.../.../trunk/
>
> 
> Which will do the diff between the two states and apply the changes to 
> the CWD you are on, which is also one of the states. In my case I do it 
> with TortoiseSVN. With the first URL being the "from" and the second the 
>   "to", and both marked with the "HEAD" revisions (which is not the 
> default for the tsvn merge dialog).

That's simple and, for lack of anything better, it's what I did. So much 
for merge tracking.

-- 
Eric Niebler
Boost Consulting
www.boost-consulting.com