gnustep-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Proposal: Switch back to savannah using GIT


From: Dr. H. Nikolaus Schaller
Subject: Re: Proposal: Switch back to savannah using GIT
Date: Mon, 25 May 2015 14:58:58 +0200

Hi Gregory,

Am 25.05.2015 um 14:45 schrieb Gregory Casamento <address@hidden>:

Forwarded to list... I forgot to add the list on this reply.

---------- Forwarded message ---------
From: Gregory Casamento <address@hidden>
Date: Mon, May 25, 2015 at 8:36 AM
Subject: Re: Proposal: Switch back to savannah using GIT
To: Fred Kiefer <address@hidden>


Hey Fred,

Granted we don't have much to worry about in the way of multiple branches at this point.  I, personally, wouldn't mind using git in GNUstep because it would allow me to create any number of experimental branches and easily merge back or cherry-pick the results back to the development branch.   Doing so under subversion feels less natural.  Additionally, we could follow the gitflow (https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) process and, thus, make certain that anything which is on either the development branch and the master branch is always build-able and deploy-able and that all work happens on branches until it is ready to merge.  Git also makes merging back from the development/master branch much easier even when there are incompatible or conflicting changes.

There have been a few times when I wished that we didn't have to deal with subversion's rather arcane merging mechanism (or, rather, lack thereof).   Additionally, as much as I hate to say it like this, more and more git is becoming more widely used than subversion ( http://www.google.com/trends/explore#q=git,svn ) and, thus, there could be a tangible benefit to switching to it only because it is something developers see as "more friendly" or "something they know."    The mirror on github has many followers in spite of my having to reset it a number of times due to the failure of the synchronization scripts on a couple of occasions (it seems to be up and running pretty consistently now).   Also there have been more than a few suggestions for fixes on github as well as branches and some pull requests.

So, I believe that git facilitates a number of things and, since it also allows you to use svn along with it... it doesn't cost us much.

Food for thought. :)   I won’t insist on any change unless others think it's also a good idea.

you describe exactly the reasons why I switched QuantumSTEP and Small WebKit to git more than a year ago:


I don’t regret this change.

There are subtle differences between git and svn which make life much easier with git - after investing quite some time to learn how to work with git.

About branching: I use private branches often with git and merge things until they are pushed out to the (single branch) public repository.

One more thing to note is the git-format-patch tool. This allows to safely share patches through e-mail for discussion. And locally applying them with git am is very easy and quite failure proof (and does not loose information).

So I would be in favour of having GNUstep to use git as well. Maybe this might even make exchanging patches with QuantumSTEP / SWK easier. Or even rejoin SWK.

BR,
Nikolaus




GC



On Mon, May 25, 2015 at 8:05 AM Fred Kiefer <address@hidden> wrote:
Hi Greg,

I don't see the big benefit in switching to git, but I wont resist that move either. We don't have that many branches of GNUstep, so cherry picking changes wont happen that often. We should make sure that the people using the only official branch, testplant, are willing to move too. Otherwise there would be really no point to it.

Cheers,
Fred

On the road

Am 25.05.2015 um 09:09 schrieb Gregory Casamento <address@hidden>:

> Hey guys,
>
> I wanted to run this past the community to see what the general feeling is.  I am considering a move back to savannah utilizing git instead of subversion.
>
> The implementation of git on savannah, I believe, allows checkout and check-in VIA subversion.  I would at least like to try to maintain a mirror there (like the one on github) so that everything can be accessed in one place and those who want to use git can do so.
>
> The reasons I have for thinking about using git are:
>
> 1)  the branching and cherrypicking capabilities.  I think it's well known that git's capabilities in this area far outstrip those of SVN hands-down.  I don't think there's any debate on this issue.
>
> 2) community. Rightly or wrongly a large community of developers prefer git over any other SCMS.   While I understand that certain people in our community don't like git for religious reasons, I also think it's time to reconsider religious arguments for technical decisions.
>
> 3) Actively developed.  GIT is under active development.  There have been few releases of SVN over the last few years.  One might attribute this to stability, but there haven't been that many advancements in SVN in a while.
>
> 4) Tools.  There are a wider range of tools on Linux, Windows and Mac to deal with git repositories these days.  Additionally there are tools which can be used to make code reviews much easier.
>
> I would like to reach some sort of consensus on this rather than a flame war.  I would ask that only active committers comment on this email thread so that we can be clear about the reasons for or against this move.   I have stated the reasons I have above.
>
> Please let me know what you think.
>
> GC
> _______________________________________________
> Discuss-gnustep mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/discuss-gnustep

_______________________________________________
Gnustep-dev mailing list
address@hidden
https://lists.gnu.org/mailman/listinfo/gnustep-dev
_______________________________________________
Discuss-gnustep mailing list
address@hidden
https://lists.gnu.org/mailman/listinfo/discuss-gnustep


reply via email to

[Prev in Thread] Current Thread [Next in Thread]