Re: [boost] svnmerge.py

From: Eric Niebler (eric_at_[hidden])
Date: 2007-12-06 15:32:22

Rene Rivera wrote:
> Eric Niebler wrote:
>> Beman?
> 
>> Eric Niebler wrote:
> 
>>> My point is that I can't use svnmerge.py because merge tracking hasn't 
>>> been enabled on the release branch. Nobody can use svnmerge.py until 
>>> someone (probably you) runs svnmerge.py init on branches/release.
> 
> AFAICT someone already ran svnmerge init on the branch. Note, anyone 
> could have done that.

Then the problem must be on my end, because svnmerge.py still doesn't 
seem to work for me. What I'm doing is:

cd branches/release
svnmerge.py merge -r 41419-41420

I expect this to merge the specified revisions from trunk to release, 
but it doesn't. Can anybody tell me what I'm doing wrong? Was it because 
release was branched from RC_1_34_0 and not trunk?

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