[asterisk-dev] Branch Merging Changes

[Russell Bryant]

Greetings,

The Asterisk 1.8 branch has been created.  (Yay!)

As a related change to this, there have been some changes to the process
of merging changes between branches.  The merge order is now:

1.4 --> 1.6.2 --> 1.8 --> trunk

So,  the 1.6.2 branch has the following properties:

   branch-1.4-merged
   branch-1.4-blocked

The 1.8 branch has:

   branch-1.6.2-merged
   branch-1.6.2-blocked

... etc.

Other than the order of the branches in the merge process (and the
corresponding property names), the usage of the svnmerge tool for
merging between branches remains the same.

Thanks,

-- 
Russell Bryant
Digium, Inc.  |  Engineering Manager, Open Source Software
445 Jan Davis Drive NW   -    Huntsville, AL 35806  -  USA
jabber: rbryant at digium.com    -=-    skype: russell-bryant
www.digium.com -=- www.asterisk.org -=- blogs.asterisk.org