[Develop] svnmerge setup for the 1.0 branch

Luc Heinrich luc at honk-honk.com
Wed Dec 19 16:31:17 EST 2007


On 19 déc. 07, at 19:07, will wrote:

> First, BDK pointed out that svnmerge comes in the subversion-tools
> package on Ubuntu.  It's probably packaged on Debian and possibly  
> Fedora
> and other systems as well.

And for those using MacPorts on OS X, it comes in the "tools" variant  
of the port so instead of doing:

sudo port install subversion

just do

sudo port install subversion +tools

and you'll get all the goodies, including svnmerge.

> Second, I agree with this workflow policy.  Check into the trunk,  
> merge
> into the branch.

I agree too. But this also means that whenever something that isn't  
meant to eventually be merged to the 1.0 branch is checked into  
trunk, an "svnmerge block" of the corresponding revision(s) must be  
done in the branch, right ?

-- 
Luc Heinrich




More information about the Develop mailing list