[boost] svnmerge.py (was: [1.35.0] branches/release open for known-good merges)

From: Eric Niebler (eric_at_[hidden])
Date: 2007-12-02 12:36:11

Beman Dawes wrote:
> Eric Niebler wrote:
>> Beman Dawes wrote:
>>> Because I always want all my trunk changes merged into branches/release, 
>>> I'm not using svnmerge.py, and am doing a tree-to-tree rather than 
>>> revsion-to-revision merge.
>> I thought we all agreed to use svnmerge.py. Am I mistaken?
> 
> Some folks think we should all be using it, but there isn't general 
> agreement AFAIK. I'm personally not interested in learning a new tool 
> that is due soon for replacement by regular Subversion. I'm 
> concentrating on trying to learn more about the regular Subversion features.

They're adding the features of svnmerge.py to svn because merge tracking 
is very important. Trying to put together a release without merge 
tracking is asking for trouble, IMO. To quote Dave:

> I hope everyone is using http://www.orcaware.com/svn/wiki/Svnmerge.py
> when merging changes between branches and trunk.  That's very
> important if we're going to avoid merge hell.

FWIW, I've been using svnmerge.py to manage a private branch and it's 
been pretty easy to use.

>> And I don't
>> want to merge all my changes from head into the release branch, just 
>> those two revisions. Is there no procedure for that?
> 
> I'd be surprised if svnmerge.py didn't support that, but I'm not 
> familiar with how it works.

It does.

> Have you tried it with regular svn merge? Once you get regular svn merge 
> doing exactly what you want, presumably svnmerge.py would use a very 
> similar set of arguments.

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.

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