Huge thanks to Joshua Colp for mirroring services

Branch Merging Changes

Share on Twitter Digg this story Click to view a printable version Sun, 25 Jul 2010 22:42:20 -0300

thumnail

Russell Bryant has posted details of some changes to the way developers need to commit code to Asterisk because of the newly released 1.8 branch:

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


You haven't voted yet! Vote:
Current Rating: 8/10 (1 votes)

Comments (Click to post)

Comments
Name:
Subject:
Website:
Message: 

Similar Articles (Based on Title)

[policy] Merging between branches - December 4, 2008
Russel has posted further musings on Branch Merging

asterisk-dev: oej/t38passthrough - new branch - March 5, 2006
Olle has posted details of a new branch for the T38 (Fax Over IP) patches.

Astlinux-users: New AstLinux Branch - September 6, 2006
Kris has posted details of a new AstLinux branch for bugfixes only. I.E. a stable branch.

Asterisk 1.4 Branch Created - September 21, 2006
The 1.4 branch for Asterisk has been created. This means that we are within hours of the 1.4 version of Asterisk being released.

1.4-beta branch of Libpri and Zaptel created - September 21, 2006
1.4 branch of LibPRI and Zaptel have also been created.

SIP Outbound Proxy in obproxy 1.4 branch and trunk - March 19, 2007
Olle is looking for comments on the Outbound Proxy Branch.

AMI update in SVN trunk based on moremanager branch - December 2, 2007
Olle has posted details of some major changes in the way that the Asterisk manager will work in version 1.6 of Asterisk.

Asterisk 1.6.0 branch created - March 10, 2008
Russell Bryant has posted details of the 1.6 branch of Asterisk in SVN.

Iaxclient-devel: Announcing the iaxclient 2.1 branch and 2.1beta1 release - March 10, 2008
The Iaxclient Team have posted details of the latest versions of IAXClient - the softphone development library.

Asterisk 1.6.2 branch now created - March 17, 2009
Russell has created a branch for 1.6.2.

New group CCSS branch - August 15, 2009
Mark Michelson has posted a note on adding Call Completion Supplementary Services to Asterisk.

Olle has an RTCP branch for 1.4 ready to test - January 22, 2010
The awesome branch Olle has been working on to fix RTCP in Asterisk is ready for testing - well worth a look.

Asterisk 1.8 Branch Creation - July 22, 2010
Russell Bryant has posted a note to inform us of the creation of the 1.8 branch of Asterisk.

Asterisk-Users: Changes to AstCC - November 7, 2004
Support added for pins. Not yet submitted, but you can email the author for a copy.


Original Content (C) 2004-2010 Matt Riddell
Back 5  Feed Add
to
Google Subscribe with Bloglines
Go to today

Icons by: FastIcon.com


Asterisk and Kamailio (openser) realtime integration
August 5, 2010 Average Vote: 10
Daniel-Constantin Mierla posted a writeup on combining Asterisk and Kamailio.

AstriDevCon: October 29th, Washington DC
August 23, 2010 Average Vote: 10
John Todd has posted a note about the AstriDevCon conference which occurs within the Astricon conference.

VoIP-Info: FFasterisk Video file converter
August 25, 2006 Average Vote: 10
The wiki has a link to a new piece of software for converting video to the format required for Asterisk.

Code Review: SRTP support for Asterisk
March 12, 2009 Average Vote: 10
Terry Wilson has moved his SRTP branch onto the Digium review board.

The Everything Asterisk Video Collection
August 5, 2010 Average Vote: 10
Steven Sokol has posted a blog entry on Asterisk Video Resources.

Voip-Forum: Lots of new articles
March 12, 2005 Average Vote: 10
Oej's Voip-Forum.com site has posted lots of new news articles while I've been away. Hopefully you found them via the asterisk-docs site. If not I've bookmarked them for you.

Interview with Mark Spencer
November 26, 2004 Average Vote: 9.9
We have managed to get an interview with Mark Spencer AKA Markster. Mark Spencer is the creator of Asterisk and by far the most active developer.

Asterisk and Kamailio realtime integration tutorial
May 24, 2010 Average Vote: 9.9
Daniel-Constantin Mierla has posted a link to a tutorial on integrating Asterisk and Kamailio using realtime.

Asterisk IPv6 update
February 1, 2010 Average Vote: 9.8
Olle has posted an update on IPV6 in Asterisk and a link to a blog post of his.

Proposal for T.38 transparent gateway design in Asterisk
April 29, 2010 Average Vote: 9.8
Kevin Fleming has posted a proposed design for a transparent T.38 gateway for Asterisk:

Back to life
July 21, 2010 Average Vote: 9.8
Hey all - I am back online after some pretty big projects which have taken all my time. Will be updating the Asterisk news over the next few days.

GUI changes from Trixbox, FreePBX, 2600hz, BlueBox
September 1, 2010 Average Vote: 9.8
Ok, bear with me on this one. If you understand all the ramifications, FreePBX has split to a new project called BlueBox contained within the 2600hz project. This obviously has implications for Trixbox that uses FreePBX to provide quite a bit of functionality.

Announcing Adhearsion 0.8.5
August 25, 2010 Average Vote: 9.8
Ben Klang has posted a note about the latest release of Adhearsion - a framework for developing Asterisk based solutions using Ruby.

app_swift v2.0 released
July 21, 2010 Average Vote: 9.8
Like a few of these news stories that I will be posting over the next couple of days this is a little old - hope it is not something you have already seen. This one is for a new version of the app_swift text-to-speech module for Asterisk 1.2, 1.4, and 1.6.

Monitoring Asterisk with Munin
January 7, 2010 Average Vote: 9.7
I had a few requests for these munin plugins after some discussion on one of the Asterisk lists and thought people might like them.


libpri 1.4.11.4 Now Available
September 3, 2010
The Asterisk Development Team has announced the release of libpri 1.4.11.4.

New CDR Stats Package
September 1, 2010
This one has been a long time coming. A new CDR stats package from Star2Billing to replace the 7 year old stalwart for viewing Asterisk call detail records.

GUI changes from Trixbox, FreePBX, 2600hz, BlueBox
September 1, 2010
Ok, bear with me on this one. If you understand all the ramifications, FreePBX has split to a new project called BlueBox contained within the 2600hz project. This obviously has implications for Trixbox that uses FreePBX to provide quite a bit of functionality.

RazorQuotePBP Asterisk Payment Module
August 31, 2010
RazorQuote has sent us a press release about the launch of RazorQuotePBP, a native Asterisk module that allows any Asterisk connected device to accept credit card payments.

CloudVox: Install an open source Asterisk phone app and get 250 dollars
August 30, 2010
CloudVox is running a competition for people to receive 250 dollars for writing up some documentation for Open Source applications on CloudVox - first in first served.

AstriCon approaches
August 25, 2010
John Todd has posted a note about the upcoming AstriCon conference in Washington, DC, and the innovation awards.

Announcing Adhearsion 0.8.5
August 25, 2010
Ben Klang has posted a note about the latest release of Adhearsion - a framework for developing Asterisk based solutions using Ruby.

Asterisk 1.8.0-beta4 Now Available
August 25, 2010
The Asterisk Development Team has announced the release of Asterisk 1.8.0-beta4.

AstriDevCon: October 29th, Washington DC
August 23, 2010
John Todd has posted a note about the AstriDevCon conference which occurs within the Astricon conference.

The XV Commandments of IVR
August 17, 2010
An update on the 15 tips for creating effective IVR systems by Allison Smith - the Voice of Asterisk.