Re: [Geany-devel] git - Re: [ANNOUNCE] gproject - yet another geany project plugin
On Thu, Jun 10, 2010 at 02:00, Lex Trotman ele...@gmail.com wrote: On 10 June 2010 02:57, Chow Loong Jin hyper...@gmail.com wrote: On Wed, 09 Jun 2010 18:15:02 +0200 Thomas Martitz thomas.mart...@student.htw-berlin.de wrote: Am 09.06.2010 18:09, schrieb Nick Treleaven: On Wed, 09 Jun 2010 15:11:48 +0200 Thomas Martitzthomas.mart...@student.htw-berlin.de wrote: Am 09.06.2010 03:40, schrieb Lex Trotman: Sure its easier if everyone is using git, but ATM this is an SVN project. Although most, if not all, geany developers use git, don't they? Do you mean git-svn? The Git repo is not writable. Yes, to me it looks like the vast majority of contributors use git (and git svn to commit to the geany/geany-plugins svn). My perception may not be very accurate though. I don't use Git for Geany, but wouldn't mind if everyone else wants to switch to it. Maybe it would be a good time to consider it in a serious manner. I would very much appreciate a switch to git :) OTOH my opinion doesn't matter very much, I guess. If Geany switches, I'd love for geany-plugins to switch as well. The switch to a dvcs would be useful since local version control would then be integrated with the main vcs (if you wanted it to be). If Geany switches then the process needs to be decided and promulgated first. Can personal branches be hosted on your host or only branches created by you, allows sm, the new unstable and bs to operate mostly like now, separate but globally visible. Who is your host? Who has permissions to do what, Git can have very fine control over who can do what. What workflow are you going to follow? eg stable branch only releases are committed to, unstable that reviewed changes and patches are committed to? or what? I'm a maintainer of this project: http://projects.gnome.org/libchamplain so I can describe my personal experience with git the way I use it (I'm not saying that it's the best workflow or that you have to use it, it's just one of the possible alternatives). First, I use two repositories that users can pull from; one at gnome: git://git.gnome.org/libchamplain and one at gitorious: http://gitorious.org/libchamplain There is only me who can push to these repositories and I always push to both synchronously at the same time. Actually I'm pushing to the repository at gnome only because gnome projects have to use this repository - otherwise the one at gitorious would be just fine. The nice thing about gitorious is can host anyone else's clones (with their own patches) of the master repository. So contributors do their development at their own clones and once they are finished, they request a merge. Then I pull their changes and apply them if I like them. I do rebases on top of the mainline's (or the appropriate branch's) HEAD - this makes the history linear and easier to follow (I know Linus discourages from rebasing in linux kernel but for such small projects like geany and libchamplain there is very small risk that someone would start his work on top of other person's branch). So in short I would suggest: 1. One person with push rights 2. Using gitorious (github or whatever) so contributors can have their own clones hosted somewhere 3. Using rebase to have linear history Jiri ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git - Re: [ANNOUNCE] gproject - yet another geany project plugin
On Wed, Jun 9, 2010 at 15:06, Nick Treleaven nick.trelea...@btinternet.com wrote: On Wed, 9 Jun 2010 13:06:45 +0200 Jiří Techet tec...@gmail.com wrote: Sure its easier if everyone is using git, but ATM this is an SVN project. It's true that I've used the workflow typical for a git project - from geany web page, which offers both git and SVN repository I assumed that I can chose either of them. If git is not supposed to be used, then it should be removed from there because this makes things confusing (or at least there should be a warning saying: Don't use the following git repository). It's pretty clear from the GIT page that it's a read-only mirror. We don't have a writable GIT repo. OK, I've just noticed: Read-only mirrors of the SVN repositories, updated shortly after real commits in the SVN repository. But then I don't see the point of providing it if you cannot pull other people's clones of your repo. Anyway, no problem for me to provide the changes in the form of individual patches. I'll just wait for the main developer's opinion on this before spamming with additional emails. Individual patches are better. That saves us time. Just looking through a Git repository isn't a good way to explain changes. OK, will send them later today Regards, Jiri ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Git - Re: [ANNOUNCE] gproject - yet another geany project plugin
On Wed, 9 Jun 2010 15:36:32 +0200 Jiří Techet tec...@gmail.com wrote: It's pretty clear from the GIT page that it's a read-only mirror. We don't have a writable GIT repo. OK, I've just noticed: Read-only mirrors of the SVN repositories, updated shortly after real commits in the SVN repository. But then I don't see the point of providing it if you cannot pull other people's clones of your repo. So people can commit locally. Regards, Nick ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] git - Re: [ANNOUNCE] gproject - yet another geany project plugin
Am 09.06.2010 18:09, schrieb Nick Treleaven: On Wed, 09 Jun 2010 15:11:48 +0200 Thomas Martitzthomas.mart...@student.htw-berlin.de wrote: Am 09.06.2010 03:40, schrieb Lex Trotman: Sure its easier if everyone is using git, but ATM this is an SVN project. Although most, if not all, geany developers use git, don't they? Do you mean git-svn? The Git repo is not writable. Yes, to me it looks like the vast majority of contributors use git (and git svn to commit to the geany/geany-plugins svn). My perception may not be very accurate though. I don't use Git for Geany, but wouldn't mind if everyone else wants to switch to it. Maybe it would be a good time to consider it in a serious manner. I would very much appreciate a switch to git :) OTOH my opinion doesn't matter very much, I guess. Best regards. ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] git - Re: [ANNOUNCE] gproject - yet another geany project plugin
On 10 June 2010 02:57, Chow Loong Jin hyper...@gmail.com wrote: On Wed, 09 Jun 2010 18:15:02 +0200 Thomas Martitz thomas.mart...@student.htw-berlin.de wrote: Am 09.06.2010 18:09, schrieb Nick Treleaven: On Wed, 09 Jun 2010 15:11:48 +0200 Thomas Martitzthomas.mart...@student.htw-berlin.de wrote: Am 09.06.2010 03:40, schrieb Lex Trotman: Sure its easier if everyone is using git, but ATM this is an SVN project. Although most, if not all, geany developers use git, don't they? Do you mean git-svn? The Git repo is not writable. Yes, to me it looks like the vast majority of contributors use git (and git svn to commit to the geany/geany-plugins svn). My perception may not be very accurate though. I don't use Git for Geany, but wouldn't mind if everyone else wants to switch to it. Maybe it would be a good time to consider it in a serious manner. I would very much appreciate a switch to git :) OTOH my opinion doesn't matter very much, I guess. If Geany switches, I'd love for geany-plugins to switch as well. The switch to a dvcs would be useful since local version control would then be integrated with the main vcs (if you wanted it to be). If Geany switches then the process needs to be decided and promulgated first. Can personal branches be hosted on your host or only branches created by you, allows sm, the new unstable and bs to operate mostly like now, separate but globally visible. Who is your host? Who has permissions to do what, Git can have very fine control over who can do what. What workflow are you going to follow? eg stable branch only releases are committed to, unstable that reviewed changes and patches are committed to? or what? Having both SVN and Git committable is difficult so everyone would have to switch. As usual the problems are non-technical ones :) Cheers Lex -- Kind regards, Chow Loong Jin ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel ___ Geany-devel mailing list Geany-devel@uvena.de http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
