<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
On 03/10/2012 09:29 AM, Martin Denham wrote:
<blockquote
cite="mid:CAJ30_OOU9iU0XowhXX62OSDYEkc7xeiAvTwBrG73S5=ocG=PhA@mail.gmail.com"
type="cite">Has there been any discussion regarding the
possibility of migrating to git?</blockquote>
<br>
No serious discussions. The major issue is that there needs to be a
master copy of the code, with all others ultimately being branches
of it. Since git can be layered over SVN, we can have SVN be the
authoritative, master copy and the layers of git be the branches.
Finally, there needs to be a small number of people that are
gatekeepers of the master.<br>
<br>
<br>
<blockquote
cite="mid:CAJ30_OOU9iU0XowhXX62OSDYEkc7xeiAvTwBrG73S5=ocG=PhA@mail.gmail.com"
type="cite">
I started development of And Bible using google-code svn but
migrated to github some months ago and it does have some
advantages.
<div><br>
</div>
<div>One advantage of git is that it makes it a lot easier to work
on branches which would have been useful during av11n
development. </div>
</blockquote>
<br>
This is more a problem with how we are using SVN. The model that we
should use is to have trunk be the next release and tag each release
from it (as we are now doing), but also to create a release branch
for each tag when needed to solve bugs, add translations, etc.<br>
<br>
In the case of av11n, it should have been done on a branch because
of how disruptive it is. Basically, a feature that cannot become
stable in a few weeks shouldn't be implemented in trunk.<br>
<br>
<br>
<blockquote
cite="mid:CAJ30_OOU9iU0XowhXX62OSDYEkc7xeiAvTwBrG73S5=ocG=PhA@mail.gmail.com"
type="cite">
<div> </div>
<div><br>
</div>
<div>Another advantage, at least when using github, is the ability
to pull, push, and create pull-requests, allowing people to more
easily contribute to your project without having any permissions
- one translator likes to work in this way and there are files
in the And Bible repo with his userid on them but he has no
permissions on the repo itself.</div>
</blockquote>
<br>
I understand how this increases collaboration, but I have some
concerns. They might be/probably are based on a misunderstanding of
how git works. I think that by layering git over svn, my concerns
probably are satisfied.<br>
<br>
<blockquote
cite="mid:CAJ30_OOU9iU0XowhXX62OSDYEkc7xeiAvTwBrG73S5=ocG=PhA@mail.gmail.com"
type="cite">
<div><br>
</div>
<div>One disadvantage is that it is more complicated, or at least
I find it so. The flip-side is I am still learning new features
even after so many months.</div>
</blockquote>
Part of my problem is that I know and am comfortable with svn. I'm
not eager to try something else, especially with a non-trivial
learning curve, if the problem can be solved simply in svn. Maybe it
is time I took a serious look at git.<br>
<br>
And thank you so much for your latest check-ins. I've not had time
to reply to you, but I really appreciate them.<br>
<br>
<blockquote
cite="mid:CAJ30_OOU9iU0XowhXX62OSDYEkc7xeiAvTwBrG73S5=ocG=PhA@mail.gmail.com"
type="cite">
<div><br>
</div>
<div>Regards</div>
<div>Martin</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
jsword-devel mailing list
<a class="moz-txt-link-abbreviated" href="mailto:jsword-devel@crosswire.org">jsword-devel@crosswire.org</a>
<a class="moz-txt-link-freetext" href="http://www.crosswire.org/mailman/listinfo/jsword-devel">http://www.crosswire.org/mailman/listinfo/jsword-devel</a>
</pre>
</blockquote>
<br>
</body>
</html>