Re: [Geany-devel] Git switch (for real)

2011-10-07 Thread Frank Lanitz
Am 06.10.2011 23:01, schrieb Enrico Tröger:
 On Wed, 05 Oct 2011 16:43:42 -0700, Matthew wrote:
 
 On 11-10-05 04:23 PM, Colomban Wendling wrote:
 Le 03/10/2011 23:02, Enrico Tröger a écrit :

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller
 personal stuff just to get it hosted somewhere, easily. And it
 worked. Github is just damn easy, fast and intuitive. While I have
 not much experience with Gitorious, it feels more like the
 opposite. Though this is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but
 GitHub

 We should make a completely separate GitHub account called geany,
 then convert it into an Organization[1], which allows all kinds of
 more neat features for a project like Geany (as opposed to having it
 as a Personal account).  See an example FOSS project account here[2].

 I will volunteer to handle setting up an Organization account and
 with the initial setup for service hooks and stuff.
 
 Yeehaw.
 Er, I think this is a good idea.
 
 Then we could also migrate the talks and newsletter repositories
 from git.geany.org to Github into the Geany organisation since these
 two repositories are no read-only mirror repositories and so better fit
 together with the rest of the project's code at one place.

+1

 And we could integrate the geany-plugins' repository there.

I'm currently thinking of an approach how to do the flow with git as the
general workflow differs a bit from Geany itself. Will come up with a
workflow proposal after 0.21 release but moving to github also in
general is a good idea.

Cheers,
Frank

___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Jacques du Rand
Hi Guys

SILLY question ! and yes I know I can google but thought you guys
might have a goto guide for it ??
Since Geany is going to git... and i've (please tell me I'm not the
only one) have never used git (as an active developer)
So wat in your opinion was the best intro/tutorial/manual about Git
that you have read ? I.e if your mom wants to learn git where would
you point her ? :)
Regards
Jacques


On Thu, Oct 6, 2011 at 1:43 AM, Matthew Brush mbr...@codebrainz.ca wrote:
 On 11-10-05 04:23 PM, Colomban Wendling wrote:

 Le 03/10/2011 23:02, Enrico Tröger a écrit :

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller personal
 stuff just to get it hosted somewhere, easily. And it worked.
 Github is just damn easy, fast and intuitive. While I have not much
 experience with Gitorious, it feels more like the opposite. Though this
 is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but GitHub

 We should make a completely separate GitHub account called geany, then
 convert it into an Organization[1], which allows all kinds of more neat
 features for a project like Geany (as opposed to having it as a Personal
 account).  See an example FOSS project account here[2].

 I will volunteer to handle setting up an Organization account and with the
 initial setup for service hooks and stuff.

 Cheers,
 Matthew Brush

 [1] https://github.com/blog/674-introducing-organizations
 [2] https://github.com/mongodb
 ___
 Geany-devel mailing list
 Geany-devel@uvena.de
 https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel

___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Lex Trotman
On 6 October 2011 17:35, Jacques du Rand jacque...@gmail.com wrote:
 Hi Guys

 SILLY question ! and yes I know I can google but thought you guys
 might have a goto guide for it ??

yeah, go to google :)

everyday git, try that and/or tutorial all on the git site :)

Cheers
lex

 Since Geany is going to git... and i've (please tell me I'm not the
 only one) have never used git (as an active developer)

everybody was a never user once

 So wat in your opinion was the best intro/tutorial/manual about Git
 that you have read ? I.e if your mom wants to learn git where would
 you point her ? :)
 Regards
 Jacques


 On Thu, Oct 6, 2011 at 1:43 AM, Matthew Brush mbr...@codebrainz.ca wrote:
 On 11-10-05 04:23 PM, Colomban Wendling wrote:

 Le 03/10/2011 23:02, Enrico Tröger a écrit :

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller personal
 stuff just to get it hosted somewhere, easily. And it worked.
 Github is just damn easy, fast and intuitive. While I have not much
 experience with Gitorious, it feels more like the opposite. Though this
 is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but GitHub

 We should make a completely separate GitHub account called geany, then
 convert it into an Organization[1], which allows all kinds of more neat
 features for a project like Geany (as opposed to having it as a Personal
 account).  See an example FOSS project account here[2].

 I will volunteer to handle setting up an Organization account and with the
 initial setup for service hooks and stuff.

 Cheers,
 Matthew Brush

 [1] https://github.com/blog/674-introducing-organizations
 [2] https://github.com/mongodb
 ___
 Geany-devel mailing list
 Geany-devel@uvena.de
 https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel

 ___
 Geany-devel mailing list
 Geany-devel@uvena.de
 https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel

___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Jiří Techet
On Thu, Oct 6, 2011 at 01:23, Colomban Wendling
lists@herbesfolles.org wrote:
 Le 03/10/2011 23:02, Enrico Tröger a écrit :
 On Mon, 03 Oct 2011 17:28:14 +0200, Colomban wrote:

 Hi all,

 Now the release is out, it's time for the real migration.  There's
 things to do then, and perhaps a few we still need to agree on.

 Yay, yay, yay.


 @all:  We will switch to Git, and we need to choose basically between
 GitHub and Gitorious.
 I'd vote for trying GitHub, just because it has one thing I quite liked
 and that Gitorious don't seem to have: comments on a particular

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller personal
 stuff just to get it hosted somewhere, easily. And it worked.
 Github is just damn easy, fast and intuitive. While I have not much
 experience with Gitorious, it feels more like the opposite. Though this
 is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but GitHub
 seems to be at least working fine, stable  stuff.  And as we don't stop
 to say, we can anyway switch to another host if it feels too bad at some
 point.  Of course keeping the same hosting is easier for people tracking
 the repo, but it's not really hard to change the remote either if there
 is a good reason to do so.

 Finally, we'll need to all (at least committers -- Nick, Enrico,
 Frank and I --, Enrico and I) work a bit together to do the switch:

 * committers needs to stop committing to SVN when export to Git starts
 * somebody (Jiří?) needs to export the SVN repo
 * somebody (me I think) need to setup an upstream repo on
 GitHub/Gitorious
 * we'll have to update everything that assume we commit to SF's SVN
 (some mirroring, commit ML, etc). Enrico, I guess we'll need you at

 Well, the GIT mirror at git.geany.org gets rather useless when Geany's
 source itself is maintained in GIT, if we want, we can keep it up
 running for backup or whatever purposes. I assume it's no problem to
 change the repository to pull from a real GIT repo instead of SVN.

 I'd like to see it still up as a mirror if you don't mind (heh, it's
 your server after all).  This would also make us have a stable hosting
 since we could change it's origin if it actually moves.

 The commit mails may be more complicated, at least on Github there
 seems nothing ready-to-use AFAIK. They have the HTTP-Push hook which
 seems quite appropriate. We just need a script to receive that push and
 make it into a mail. However, I'm optimistic there is somewhere a
 usable implementation out there on the net.

 Matthew seems to suggest it may be easy, let's hope so :D  Maybe I/you
 could try with another project just to see if this work, not to rush the
 final day ^^

 I'd also need to adjust the nightly builds and some update scripts on
 geany.org but this is less important and can be done asynchronously,
 read later. The only critical to me are the commit mails.

 Great then, makes the plan looking even more reasonable :)

 So, we'll need to work together soon, and that'll need us to coordinate
 ourselves.  So Jiří (if you accept re-exporting), Enrico, Nick and
 Frank: when can we do the actual switch?  I can have the time whenever
 I want this week, I just need to know ;)

 I'm also for as soon as possible, upcoming weekend would be fine for me,
 ideally on Sunday.

 OK, let's say Sunday then since it seems to fit :)

ACK. Would it be possible that I start with the conversion on Saturday
evening already? First I'm not sure how much time I'll have on Sunday,
second it gives us some time buffer if something goes wrong or if I
need some further clarifications during the conversion. From your side
it would just mean to stop comitting to SVN Saturday evening (let's
say 6 P.M. CET which is GMT+2 during summer - recalculate it to your
time zone).

In any case, I'll send an announcement that I started with the conversion.

Cheers,
Jiri
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Enrico Tröger
On Thu, 6 Oct 2011 10:52:44 +0200, Jiří wrote:


 OK, let's say Sunday then since it seems to fit :)

ACK. Would it be possible that I start with the conversion on Saturday
evening already? First I'm not sure how much time I'll have on Sunday,
second it gives us some time buffer if something goes wrong or if I

Good idea. I'd be fine with Saturday evening.


need some further clarifications during the conversion. From your side
it would just mean to stop comitting to SVN Saturday evening (let's
say 6 P.M. CET which is GMT+2 during summer - recalculate it to your
time zone).

In any case, I'll send an announcement that I started with the
conversion.

Great.

Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgpwMbf01ogk7.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Enrico Tröger
On Thu, 06 Oct 2011 01:23:11 +0200, Colomban wrote:

Heya,

 * we'll have to update everything that assume we commit to SF's SVN
 (some mirroring, commit ML, etc). Enrico, I guess we'll need you at
 
 Well, the GIT mirror at git.geany.org gets rather useless when
 Geany's source itself is maintained in GIT, if we want, we can keep
 it up running for backup or whatever purposes. I assume it's no
 problem to change the repository to pull from a real GIT repo
 instead of SVN.

I'd like to see it still up as a mirror if you don't mind (heh, it's
your server after all).  This would also make us have a stable
hosting since we could change it's origin if it actually moves.

Ok, fine. Don't worry about the server, the GIT mirror is the least bit
it has to do :D.


 The commit mails may be more complicated, at least on Github there
 seems nothing ready-to-use AFAIK. They have the HTTP-Push hook which
 seems quite appropriate. We just need a script to receive that push
 and make it into a mail. However, I'm optimistic there is somewhere a
 usable implementation out there on the net.

Matthew seems to suggest it may be easy, let's hope so :D  Maybe I/you
could try with another project just to see if this work, not to rush
the final day ^^

Will do. I'll start playing with this right now, so we are not that
surprised on Sunday :D.


 So, we'll need to work together soon, and that'll need us to
 coordinate ourselves.  So Jiří (if you accept re-exporting),
 Enrico, Nick and Frank: when can we do the actual switch?  I can
 have the time whenever I want this week, I just need to know ;)
 
 I'm also for as soon as possible, upcoming weekend would be fine for
 me, ideally on Sunday.

OK, let's say Sunday then since it seems to fit :)

Great.


Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgpm8HNdmZQVw.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Enrico Tröger
On Wed, 05 Oct 2011 16:43:42 -0700, Matthew wrote:

On 11-10-05 04:23 PM, Colomban Wendling wrote:
 Le 03/10/2011 23:02, Enrico Tröger a écrit :

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller
 personal stuff just to get it hosted somewhere, easily. And it
 worked. Github is just damn easy, fast and intuitive. While I have
 not much experience with Gitorious, it feels more like the
 opposite. Though this is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but
 GitHub

We should make a completely separate GitHub account called geany,
then convert it into an Organization[1], which allows all kinds of
more neat features for a project like Geany (as opposed to having it
as a Personal account).  See an example FOSS project account here[2].

I will volunteer to handle setting up an Organization account and
with the initial setup for service hooks and stuff.

Yeehaw.
Er, I think this is a good idea.

Then we could also migrate the talks and newsletter repositories
from git.geany.org to Github into the Geany organisation since these
two repositories are no read-only mirror repositories and so better fit
together with the rest of the project's code at one place.

And we could integrate the geany-plugins' repository there.


Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgp1RJD1IZuVw.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Colomban Wendling
Le 06/10/2011 22:35, Enrico Tröger a écrit :
 On Thu, 6 Oct 2011 10:52:44 +0200, Jiří wrote:
 
 
 OK, let's say Sunday then since it seems to fit :)

 ACK. Would it be possible that I start with the conversion on Saturday
 evening already? First I'm not sure how much time I'll have on Sunday,
 second it gives us some time buffer if something goes wrong or if I
 
 Good idea. I'd be fine with Saturday evening.

+1, and I'm fine with Saturday evening too.

 need some further clarifications during the conversion. From your side
 it would just mean to stop comitting to SVN Saturday evening (let's
 say 6 P.M. CET which is GMT+2 during summer - recalculate it to your
 time zone).

 In any case, I'll send an announcement that I started with the
 conversion.

Maybe CC Nick, I'm not sure he reads all ML's mail, and he better know it :)

Cheers,
Colomban
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Colomban Wendling
Le 06/10/2011 23:01, Enrico Tröger a écrit :
 On Wed, 05 Oct 2011 16:43:42 -0700, Matthew wrote:
 
 On 11-10-05 04:23 PM, Colomban Wendling wrote:
 Le 03/10/2011 23:02, Enrico Tröger a écrit :

 While I usually plead for free software I'd also vote for Github in
 this regard. In the last weeks I started to use it for smaller
 personal stuff just to get it hosted somewhere, easily. And it
 worked. Github is just damn easy, fast and intuitive. While I have
 not much experience with Gitorious, it feels more like the
 opposite. Though this is just my personal opinion.

 Well then, let's try GitHub.  I also prefer FOSS everywhere, but
 GitHub

 We should make a completely separate GitHub account called geany,
 then convert it into an Organization[1], which allows all kinds of
 more neat features for a project like Geany (as opposed to having it
 as a Personal account).  See an example FOSS project account here[2].

 I will volunteer to handle setting up an Organization account and
 with the initial setup for service hooks and stuff.
 
 Yeehaw.
 Er, I think this is a good idea.
 
 Then we could also migrate the talks and newsletter repositories
 from git.geany.org to Github into the Geany organisation since these
 two repositories are no read-only mirror repositories and so better fit
 together with the rest of the project's code at one place.
 
 And we could integrate the geany-plugins' repository there.

Good points, +1 :)

Cheers,
Colomban
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-06 Thread Enrico Tröger
On Mon, 03 Oct 2011 15:17:44 -0700, Matthew wrote:

On 11-10-03 02:02 PM, Enrico Tröger wrote:

 The commit mails may be more complicated, at least on Github there
 seems nothing ready-to-use AFAIK. They have the HTTP-Push hook which
 seems quite appropriate. We just need a script to receive that push
 and make it into a mail. However, I'm optimistic there is somewhere a
 usable implementation out there on the net.


GitHub has an Email service hook, presumably you could get this to 
send a message to some mailing list.  There's also a service hook for
IRC.

Oops, I must have overlooked it somehow or they just added it after I
checked last time :D.

Anyways, I tried setting it up and as some of you might have seen, a
test commit mail gone through onto the list, so it works pretty
straight and easy.

Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgpeABouFCYIt.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-05 Thread Matthew Brush

On 11-10-05 04:23 PM, Colomban Wendling wrote:

Le 03/10/2011 23:02, Enrico Tröger a écrit :


While I usually plead for free software I'd also vote for Github in
this regard. In the last weeks I started to use it for smaller personal
stuff just to get it hosted somewhere, easily. And it worked.
Github is just damn easy, fast and intuitive. While I have not much
experience with Gitorious, it feels more like the opposite. Though this
is just my personal opinion.


Well then, let's try GitHub.  I also prefer FOSS everywhere, but GitHub


We should make a completely separate GitHub account called geany, then 
convert it into an Organization[1], which allows all kinds of more 
neat features for a project like Geany (as opposed to having it as a 
Personal account).  See an example FOSS project account here[2].


I will volunteer to handle setting up an Organization account and with 
the initial setup for service hooks and stuff.


Cheers,
Matthew Brush

[1] https://github.com/blog/674-introducing-organizations
[2] https://github.com/mongodb
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


[Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Colomban Wendling
Hi all,

Now the release is out, it's time for the real migration.  There's
things to do then, and perhaps a few we still need to agree on.


Le 05/09/2011 23:05, Jiří Techet a écrit :
 [...]
 
 End of the long email finally! I tried to record all what needs to be
 done so nothing is forgotten once the real migration takes place
 because some of the stuff took some time to discover.

@Jiří: Would you mind doing the real export since you know have a little
experience?


@all:  We will switch to Git, and we need to choose basically between
GitHub and Gitorious.
I'd vote for trying GitHub, just because it has one thing I quite liked
and that Gitorious don't seem to have: comments on a particular commit's
line.  I did use it a few times with Matthew, and I felt it quite
convenient to comment details [1]
Apart that I don't mind, both have the necessary stuff, and Gitorious is
more free as in freedom.


Also, I think that we should at least try Vincent Driessen's branching
model [2] (e.g. develop branch + feature branches + release branches).
It might looks a bit containing at first glance, but also makes things
clean -- but note I never tried it in a real project, maybe I'm wrong.


Finally, we'll need to all (at least committers -- Nick, Enrico, Frank
and I --, Enrico and I) work a bit together to do the switch:

 * committers needs to stop committing to SVN when export to Git starts
 * somebody (Jiří?) needs to export the SVN repo
 * somebody (me I think) need to setup an upstream repo on
GitHub/Gitorious
 * we'll have to update everything that assume we commit to SF's SVN
(some mirroring, commit ML, etc). Enrico, I guess we'll need you at
least to help here still a bit, sorry ^^

So, we'll need to work together soon, and that'll need us to coordinate
ourselves.  So Jiří (if you accept re-exporting), Enrico, Nick and
Frank: when can we do the actual switch?  I can have the time whenever I
want this week, I just need to know ;)


It would be good if all this could be done as soon as possible so we can
start development again using this new scheme.  Sooner's better.


Cheers,
Colomban


[1] I don't suggest to move all discussion outside the ML, far from me
this idea.
[2] http://nvie.com/posts/a-successful-git-branching-model/
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Frank Lanitz
On Mon, 03 Oct 2011 17:28:14 +0200
Colomban Wendling lists@herbesfolles.org wrote:

 Frank: when can we do the actual switch?  I can have the time
 whenever I want this week, I just need to know ;)

I suggest weekend around 2011-10-29. At least at this weekend I've
nothing planned yet. But IIRC Enrico was on travel at this date. 

Cheers, 
Frank 
-- 
http://frank.uvena.de/en/


pgpkhlPpD3mYx.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Dominic Hopf
Am Montag, den 03.10.2011, 17:28 +0200 schrieb Colomban Wendling:
 Apart that I don't mind, both have the necessary stuff, and Gitorious
 is more free as in freedom.

Exactly the reason why I'd personally prefer Gitorous over Github. :)

Regards,
Dominic

-- 
Dominic Hopf dma...@googlemail.com
http://dominichopf.de/

Key Fingerprint: A7DF C4FC 07AE 4DDC 5CA0 BD93 AAB0 6019 CA7D 868D


signature.asc
Description: This is a digitally signed message part
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Colomban Wendling
Le 03/10/2011 17:32, Frank Lanitz a écrit :
 On Mon, 03 Oct 2011 17:28:14 +0200
 Colomban Wendling lists@herbesfolles.org wrote:
 
 Frank: when can we do the actual switch?  I can have the time
 whenever I want this week, I just need to know ;)
 
 I suggest weekend around 2011-10-29. At least at this weekend I've
 nothing planned yet. But IIRC Enrico was on travel at this date. 

I feel it a bit too far, but...

However, I think that for normal committers (you, Nick), there's not
much to do:

1) stop committing to SVN during the export;
2) create an account on the new hosting site if not already done;
3) tell the repo owner (me(?)) to grant you commit  stuff rights;
4) start committing using Git on new host.

Apart 1, you can even still commit during the process since Git is a
DVCS, only push would require steps 2 and 3.

I think this is pretty cheap and can probably be done in a couple of
minutes, plus maybe another couple of minutes to read/check the new
committing rules (e.g. push development commit to develop branch rather
than master, etc.).

The big part is the SVN export/import and porting of commit hooks, not
sure if you have some?

I'm not saying you shouldn't participate (the more qualified volunteers
the better!), just that maybe if you haven't the time we can do by
ourselves ;)


Cheers,
Colomban
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Jiří Techet
On Mon, Oct 3, 2011 at 17:28, Colomban Wendling
lists@herbesfolles.org wrote:
 Hi all,

 Now the release is out, it's time for the real migration.  There's
 things to do then, and perhaps a few we still need to agree on.


 Le 05/09/2011 23:05, Jiří Techet a écrit :
 [...]

 End of the long email finally! I tried to record all what needs to be
 done so nothing is forgotten once the real migration takes place
 because some of the stuff took some time to discover.

 @Jiří: Would you mind doing the real export since you know have a little
 experience?

Sure, no problem. Just one thing I'd like to mention - I may be a
security problem. During the export I can modify any commit (e.g. to
send me the contents of the editor by email) and you probably won't
notice. On the other hand, the good thing is that:

1. I don't feel it's something I'd like to do (but you cannot be sure
I'm telling you the truth)
2. You can compare the current state of master with your SVN checkout
so you'll see immediately if there's something wrong with the top of
trunk. I might modify  some past commits but these would have lower
impact because everyone either uses the latest trunk or the latest
stable release.

Actually what's much more probable is that I screw up the conversion
somehow ;-).



 @all:  We will switch to Git, and we need to choose basically between
 GitHub and Gitorious.
 I'd vote for trying GitHub, just because it has one thing I quite liked
 and that Gitorious don't seem to have: comments on a particular commit's
 line.  I did use it a few times with Matthew, and I felt it quite
 convenient to comment details [1]
 Apart that I don't mind, both have the necessary stuff, and Gitorious is
 more free as in freedom.


 Also, I think that we should at least try Vincent Driessen's branching
 model [2] (e.g. develop branch + feature branches + release branches).
 It might looks a bit containing at first glance, but also makes things
 clean -- but note I never tried it in a real project, maybe I'm wrong.


 Finally, we'll need to all (at least committers -- Nick, Enrico, Frank
 and I --, Enrico and I) work a bit together to do the switch:

  * committers needs to stop committing to SVN when export to Git starts
  * somebody (Jiří?) needs to export the SVN repo
  * somebody (me I think) need to setup an upstream repo on
 GitHub/Gitorious
  * we'll have to update everything that assume we commit to SF's SVN
 (some mirroring, commit ML, etc). Enrico, I guess we'll need you at
 least to help here still a bit, sorry ^^

 So, we'll need to work together soon, and that'll need us to coordinate
 ourselves.  So Jiří (if you accept re-exporting), Enrico, Nick and
 Frank: when can we do the actual switch?  I can have the time whenever I
 want this week, I just need to know ;)


 It would be good if all this could be done as soon as possible so we can
 start development again using this new scheme.  Sooner's better.

About the timing, I'd prefer this weekend. There have been suggestions
like 2011-10-29 but this is my birthday and even though I like Geany,
I want to spend my birthday in a different way than making git
conversions ;-).

Cheers,
Jiri
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Colomban Wendling
Le 03/10/2011 18:59, Jiří Techet a écrit :
 On Mon, Oct 3, 2011 at 17:28, Colomban Wendling
 lists@herbesfolles.org wrote:
 Hi all,

 Now the release is out, it's time for the real migration.  There's
 things to do then, and perhaps a few we still need to agree on.


 Le 05/09/2011 23:05, Jiří Techet a écrit :
 [...]

 End of the long email finally! I tried to record all what needs to be
 done so nothing is forgotten once the real migration takes place
 because some of the stuff took some time to discover.

 @Jiří: Would you mind doing the real export since you know have a little
 experience?
 
 Sure, no problem. Just one thing I'd like to mention - I may be a
 security problem. During the export I can modify any commit (e.g. to
 send me the contents of the editor by email) and you probably won't
 notice. On the other hand, the good thing is that:

Right, good remark, though making it gives you even more credit ^^

 1. I don't feel it's something I'd like to do (but you cannot be sure
 I'm telling you the truth)

Heh, thanks for willingness at least!

 2. You can compare the current state of master with your SVN checkout
 so you'll see immediately if there's something wrong with the top of
 trunk. I might modify  some past commits but these would have lower
 impact because everyone either uses the latest trunk or the latest
 stable release.

Yeah, there are easy ways to check the result fits SVN HEAD.  Checking
older branches and tags are a bit harder, yet doable, but as you say
yourself, it's less sensitive.  And let's be honest, I could be the bad
guy here too... ^^

 Actually what's much more probable is that I screw up the conversion
 somehow ;-).

Not better than I would do ;)

 [...]

 It would be good if all this could be done as soon as possible so we can
 start development again using this new scheme.  Sooner's better.
 
 About the timing, I'd prefer this weekend. There have been suggestions
 like 2011-10-29 but this is my birthday and even though I like Geany,
 I want to spend my birthday in a different way than making git
 conversions ;-).

I can't understand this, it's s selfish ;(  (just kidding)

Actually I feel would prefer it to be next weekend because it's sooner,
and as said in another mail, I'm not sure we really need more than you,
Enrico and I to complete it.

Let's wait for Enrico's answer (if he's still on that ML, hehe!) and see
when he got enough spare time to spend on it.


Cheers,
Colomban
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Frank Lanitz
On Mon, 3 Oct 2011 18:59:49 +0200
Jiří Techet tec...@gmail.com wrote:

 On Mon, Oct 3, 2011 at 17:28, Colomban Wendling
 lists@herbesfolles.org wrote:
  Hi all,
 
  Now the release is out, it's time for the real migration.  There's
  things to do then, and perhaps a few we still need to agree on.
 
 
  Le 05/09/2011 23:05, Jiří Techet a écrit :
  [...]
 
  End of the long email finally! I tried to record all what needs to
  be done so nothing is forgotten once the real migration takes place
  because some of the stuff took some time to discover.
 
  @Jiří: Would you mind doing the real export since you know have a
  little experience?
 
 Sure, no problem. Just one thing I'd like to mention - I may be a
 security problem. During the export I can modify any commit (e.g. to
 send me the contents of the editor by email) and you probably won't
 notice. On the other hand, the good thing is that:
 
 1. I don't feel it's something I'd like to do (but you cannot be sure
 I'm telling you the truth)

Well. We can verify the hash of source code after transition with the
hash we do have signed on server or e.g. in our personal git repos. 

 2. You can compare the current state of master with your SVN checkout
 so you'll see immediately if there's something wrong with the top of
 trunk. I might modify  some past commits but these would have lower
 impact because everyone either uses the latest trunk or the latest
 stable release.

ACK. 

 About the timing, I'd prefer this weekend. There have been suggestions
 like 2011-10-29 but this is my birthday and even though I like Geany,
 I want to spend my birthday in a different way than making git
 conversions ;-).

I'm fine also with this. 

Cheers, 
Frank 
-- 
http://frank.uvena.de/en/


pgpg6rulPTbUC.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Frank Lanitz
On Mon, 03 Oct 2011 18:29:25 +0200
Colomban Wendling lists@herbesfolles.org wrote:

 Le 03/10/2011 17:32, Frank Lanitz a écrit :
  On Mon, 03 Oct 2011 17:28:14 +0200
  Colomban Wendling lists@herbesfolles.org wrote:
  
  Frank: when can we do the actual switch?  I can have the time
  whenever I want this week, I just need to know ;)
  
  I suggest weekend around 2011-10-29. At least at this weekend I've
  nothing planned yet. But IIRC Enrico was on travel at this date. 
 
 I feel it a bit too far, but...
 
 However, I think that for normal committers (you, Nick), there's not
 much to do:
 
 1) stop committing to SVN during the export;
 2) create an account on the new hosting site if not already done;
 3) tell the repo owner (me(?)) to grant you commit  stuff rights;
 4) start committing using Git on new host.
 
 Apart 1, you can even still commit during the process since Git is a
 DVCS, only push would require steps 2 and 3.
 
 I think this is pretty cheap and can probably be done in a couple of
 minutes, plus maybe another couple of minutes to read/check the new
 committing rules (e.g. push development commit to develop branch
 rather than master, etc.).
 
 The big part is the SVN export/import and porting of commit hooks,
 not sure if you have some?
 
 I'm not saying you shouldn't participate (the more qualified
 volunteers the better!), just that maybe if you haven't the time we
 can do by ourselves ;)

You asked for a date when I'm free so I looked up ;) 
But as mentioned in another mail also this weekend would be fine or any
other date as I don't be involved this much at this phase. 

Cheers, 
Frank 
-- 
http://frank.uvena.de/en/


pgpSigdpp5NRB.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Matthew Brush

On 11-10-03 08:33 AM, Dominic Hopf wrote:

Am Montag, den 03.10.2011, 17:28 +0200 schrieb Colomban Wendling:

Apart that I don't mind, both have the necessary stuff, and Gitorious
is more free as in freedom.


Exactly the reason why I'd personally prefer Gitorous over Github. :)



Do you plan to put a copy of Gitorious's web UI on your own server or 
something?  Maybe installed next to your local GMail installation?


/sarcasm

Cheers,
Matthew Brush
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real) (was: Re: geany on github; why not?)

2011-10-03 Thread Enrico Tröger
On Mon, 03 Oct 2011 17:28:14 +0200, Colomban wrote:

Hi all,

Now the release is out, it's time for the real migration.  There's
things to do then, and perhaps a few we still need to agree on.

Yay, yay, yay.


@all:  We will switch to Git, and we need to choose basically between
GitHub and Gitorious.
I'd vote for trying GitHub, just because it has one thing I quite liked
and that Gitorious don't seem to have: comments on a particular

While I usually plead for free software I'd also vote for Github in
this regard. In the last weeks I started to use it for smaller personal
stuff just to get it hosted somewhere, easily. And it worked.
Github is just damn easy, fast and intuitive. While I have not much
experience with Gitorious, it feels more like the opposite. Though this
is just my personal opinion.


Finally, we'll need to all (at least committers -- Nick, Enrico,
Frank and I --, Enrico and I) work a bit together to do the switch:

 * committers needs to stop committing to SVN when export to Git starts
 * somebody (Jiří?) needs to export the SVN repo
 * somebody (me I think) need to setup an upstream repo on
GitHub/Gitorious
 * we'll have to update everything that assume we commit to SF's SVN
(some mirroring, commit ML, etc). Enrico, I guess we'll need you at

Well, the GIT mirror at git.geany.org gets rather useless when Geany's
source itself is maintained in GIT, if we want, we can keep it up
running for backup or whatever purposes. I assume it's no problem to
change the repository to pull from a real GIT repo instead of SVN.

The commit mails may be more complicated, at least on Github there
seems nothing ready-to-use AFAIK. They have the HTTP-Push hook which
seems quite appropriate. We just need a script to receive that push and
make it into a mail. However, I'm optimistic there is somewhere a
usable implementation out there on the net.

I'd also need to adjust the nightly builds and some update scripts on
geany.org but this is less important and can be done asynchronously,
read later. The only critical to me are the commit mails.


So, we'll need to work together soon, and that'll need us to coordinate
ourselves.  So Jiří (if you accept re-exporting), Enrico, Nick and
Frank: when can we do the actual switch?  I can have the time whenever
I want this week, I just need to know ;)

I'm also for as soon as possible, upcoming weekend would be fine for me,
ideally on Sunday.

Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgpIubfkJGOOm.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Enrico Tröger
On Mon, 03 Oct 2011 19:15:23 +0200, Colomban wrote:



Let's wait for Enrico's answer (if he's still on that ML, hehe!) and

Ha, I got a personal reminder (thanks Frank) though I would have read
this anyways. And answered a bit above in this thread.


Regards,
Enrico

-- 
Get my GPG key from http://www.uvena.de/pub.asc


pgppVGNqYyOIS.pgp
Description: PGP signature
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel


Re: [Geany-devel] Git switch (for real)

2011-10-03 Thread Matthew Brush

On 11-10-03 02:02 PM, Enrico Tröger wrote:


The commit mails may be more complicated, at least on Github there
seems nothing ready-to-use AFAIK. They have the HTTP-Push hook which
seems quite appropriate. We just need a script to receive that push and
make it into a mail. However, I'm optimistic there is somewhere a
usable implementation out there on the net.



GitHub has an Email service hook, presumably you could get this to 
send a message to some mailing list.  There's also a service hook for IRC.


It also has RSS feeds for repositories as well as all kinds of 
notifications that users can enable for different things (like commits, 
comments, issues, etc).


Cheers,
Matthew Brush
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel