<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>6 dec 2012 kl. 09:46 skrev Dan Jenkins <<a href="mailto:dan.jenkins@holidayextras.com">dan.jenkins@holidayextras.com</a>>:</div><br class="Apple-interchange-newline"><blockquote type="cite">Hi,<div><br></div><div>I'm not a contributor to dahdi but I am on this mailing list, and we've already had this conversation in part about Asterisk specifically moving to git, but I really don't understand why you wouldn't utilise github or even bitbucket (which is now integrated into atlassian's on-demand/hosted service - so I think you should have access to it) rather than having to run your own git servers. By using either of these tools (or the many more out there online) you could end up getting even more interaction within the dahdi project, if you still want a core backup then make <a href="http://git.asterisk.org/">git.asterisk.org</a> your core backup, and get bitbucket or github to clone back to <a href="http://git.asterisk.org/">git.asterisk.org</a> using a git hook.</div>
<div><br></div><div>Just my opinion, but isn't that part of the whole reason for moving to git? Yes, git can be much nicer to work with but git naturally allows more people to get involved in a project, due to these awesome tools,</div>
<div> </div></blockquote><div><br></div>Digium is a commercial company and by far the largest sponsor of Asterisk and Dahdi. By the licensing agreement, they have commercial</div><div>rights to the source code. When dealing with the commercial side of Asterisk, there are probably agreements in place that relates</div><div>to code management, something that is quite common in larger commercial software deals. </div><div><br></div><div>Reading the <a href="http://github.com">github.com</a> terms of service, where they can shut down the service at any time, without any notice, I'm a bit concerned. They also</div><div>reserve the right to judge my content. I would have a problem with the terms in commercial projects. (I'm speculating here, since I'm not aware </div><div>of any details of Digium's dealings with 3rd parties).</div><div><br></div><div>In addition, there are things that we as Asterisk developers have grown depending on that needs to be in place, like the automerge system that is awesome,</div><div>but not in place in many other projects. I personally don't know if that's a feature of GIT or and addon, but most people I've asked haven't given </div><div>me any answers on how to replace that.</div><div><br></div><div>I think we as a project have to respect Digium's situation and follow their flow in this case. I'm grateful for the infrastructure provided by Digium,</div><div>and as a constant abuser of branching and automerging in their svn, I can't complain ;-)</div><div><br></div><div>While GITHUB may be great, I don't like a situation where one site, one company has all the infrastructure. Diversity is great.</div><div>The internet is a distributed model. </div><div><br></div><div>/O</div><div><br><br><blockquote type="cite"><div>Dan Jenkins</div><div class="gmail_extra"><br clear="all"><font face="arial, helvetica, sans-serif" color="#333333">-- <br>Dan Jenkins - Senior Web Developer<br>email: <a href="mailto:dan.jenkins@holidayextras.com" target="_blank">dan.jenkins@holidayextras.com</a><br>
twitter: <a href="http://twitter.com/dan_jenkins" target="_blank">dan_jenkins</a><br>linkedin: <a href="http://www.linkedin.com/in/jenkinsdaniel" target="_blank">jenkinsdaniel</a><br>skype: <a>d-jenkins</a></font><div><font face="arial, helvetica, sans-serif" color="#333333">blog: <a href="http://www.dan-jenkins.co.uk/" target="_blank">www.dan-jenkins.co.uk</a></font></div>
<div><font face="arial, helvetica, sans-serif" color="#333333"><a href="http://about.me/" target="_blank">about.me</a>: <a href="http://about.me/dan_jenkins" target="_blank">about.me/dan_jenkins</a></font></div><br>
<br><br><div class="gmail_quote">On 5 December 2012 16:52, Russ Meyerriecks <span dir="ltr"><<a href="mailto:rmeyerriecks@digium.com" target="_blank">rmeyerriecks@digium.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Great news! DAHDI is migrating to Git!<br>
<br>
This is mainly to ease development burden as the DAHDI developers<br>
already use Git in our primary workflow. Also, the Asterisk project<br>
has expressed interest in making the same move and might be<br>
interested in our switch as a pilot. [1]<br>
<br>
The idea here is to create a non-rewindable "golden" repo that<br>
developers may clone from. Patches may be built off of this repo as<br>
was done prior in svn. More info will be provided on the wiki but<br>
here is a quick example:<br>
<br>
Previously:<br>
svn co <a href="http://svn.asterisk.org/svn/dahdi/linux/trunk" target="_blank">http://svn.asterisk.org/svn/dahdi/linux/trunk</a> dahdi-linux<br>
cd dahdi-linux<br>
<make edits to files><br>
svn diff > patch.patch<br>
<upload patch to <a href="http://issues.asterisk.org/" target="_blank">http://issues.asterisk.org</a>><br>
<br>
Now:<br>
git clone git://<a href="http://git.asterisk.org/dahdi/linux" target="_blank">git.asterisk.org/dahdi/linux</a> dahdi-linux<br>
cd dahdi-linux<br>
<make edits to files><br>
git commit -a<br>
<write commit message><br>
git format-patch HEAD^<br>
<upload patch to <a href="http://issues.asterisk.org/" target="_blank">http://issues.asterisk.org</a>><br>
<br>
I have created what I think to be a suitable "golden" dahdi-linux<br>
git repo here:<br>
<a href="http://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=summary" target="_blank">http://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=summary</a><br>
<br>
Here are the highlights:<br>
<br>
* It contains all commits from version 2.4.0 and up. DAHDI versions<br>
prior to 2.4.0 contain a subversion external (the oct612x library)<br>
which breaks compiles from git checkouts. We plan on creating a<br>
dahdi/history git repository that does a best effort job of<br>
publishing the entire history of DAHDI in a git repository.<br>
<br>
* Development branches have been named 2.4.y, 2.5.y, 2.6.y to follow<br>
linux tree convention. Point releases and minior point releases are<br>
then tagged off of these.<br>
<br>
* All svn "tags" are now git tags with proper reference off of their<br>
development branch. Tags beginning with "v" indicate a cut/tarballed<br>
release.<br>
<br>
* Author attributes are handled properly where able. If you<br>
submitted a patch in the past that was committed by somebody else,<br>
you might now have the proper attribution. (This is a big bonus<br>
feature of git vs svn, in my mind)<br>
<br>
* I've added a series of branched-* tags that are used to indicate,<br>
from the main branch, where a sub-branch joins. This is handy in<br>
situations when you're browsing the code and would like to know what<br>
patches are in what version.<br>
<br>
If you have an interest in DAHDI, please give the repo a sanity<br>
check as feedback is welcome.<br>
<br>
As this migration moves forward, I will be adding more info onto a<br>
page on <a href="http://wiki.asterisk.org/" target="_blank">wiki.asterisk.org</a>. I will explain the git workflow and how<br>
to do everything you're currently doing in svn, in git.<br>
<br>
[1] <a href="https://wiki.asterisk.org/wiki/display/AST/AstriDevCon+2012#AstriDevCon2012-Policies" target="_blank">https://wiki.asterisk.org/wiki/display/AST/AstriDevCon+2012#AstriDevCon2012-Policies</a><br>
--<br>
Russ Meyerriecks<br>
Digium, Inc. | Linux Kernel Developer<br>
445 Jan Davis Drive NW - Huntsville, AL 35806 - USA<br>
direct: +1 256-428-6025<br>
Check us out at: <a href="http://www.digium.com/" target="_blank">www.digium.com</a> & <a href="http://www.asterisk.org/" target="_blank">www.asterisk.org</a><br>
<br>
--<br>
_____________________________________________________________________<br>
-- Bandwidth and Colocation Provided by <a href="http://www.api-digital.com/" target="_blank">http://www.api-digital.com</a> --<br>
<br>
asterisk-dev mailing list<br>
To UNSUBSCRIBE or update options visit:<br>
<a href="http://lists.digium.com/mailman/listinfo/asterisk-dev" target="_blank">http://lists.digium.com/mailman/listinfo/asterisk-dev</a><br>
</blockquote></div><br></div>
--<br>_____________________________________________________________________<br>-- Bandwidth and Colocation Provided by <a href="http://www.api-digital.com">http://www.api-digital.com</a> --<br><br>asterisk-dev mailing list<br>To UNSUBSCRIBE or update options visit:<br> <a href="http://lists.digium.com/mailman/listinfo/asterisk-dev">http://lists.digium.com/mailman/listinfo/asterisk-dev</a></blockquote></div><br></body></html>