Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Magnus Hagander
On Wed, Aug 18, 2010 at 10:37, Guillaume Lelarge wrote: > Le 18/08/2010 10:25, Dave Page a écrit : >> On Wed, Aug 18, 2010 at 9:20 AM, Magnus Hagander wrote: >> >>> You are supposed to work by having one "his branch" on his repo and >>> one "gleus branch" on your repo. Then you merge with his, an

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Dave Page
On Wed, Aug 18, 2010 at 9:39 AM, Guillaume Lelarge wrote: > I'm not against having a new mindset, but that will take some time. I > can probably try this with Luis. I have to talk with him about it. As it's in your own private repo(s), it really doesn't matter to anyone else how you choose to col

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Guillaume Lelarge
Le 18/08/2010 10:32, Magnus Hagander a écrit : > On Wed, Aug 18, 2010 at 10:25, Dave Page wrote: >> On Wed, Aug 18, 2010 at 9:20 AM, Magnus Hagander wrote: >> >>> You are supposed to work by having one "his branch" on his repo and >>> one "gleus branch" on your repo. Then you merge with his, and

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Guillaume Lelarge
Le 18/08/2010 10:25, Dave Page a écrit : > On Wed, Aug 18, 2010 at 9:20 AM, Magnus Hagander wrote: > >> You are supposed to work by having one "his branch" on his repo and >> one "gleus branch" on your repo. Then you merge with his, and if you >> make changes, he merges with yours, back and forth

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Magnus Hagander
On Wed, Aug 18, 2010 at 10:25, Dave Page wrote: > On Wed, Aug 18, 2010 at 9:20 AM, Magnus Hagander wrote: > >> You are supposed to work by having one "his branch" on his repo and >> one "gleus branch" on your repo. Then you merge with his, and if you >> make changes, he merges with yours, back an

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Dave Page
On Wed, Aug 18, 2010 at 9:20 AM, Magnus Hagander wrote: > You are supposed to work by having one "his branch" on his repo and > one "gleus branch" on your repo. Then you merge with his, and if you > make changes, he merges with yours, back and forth until you agree on > something that's good. At

Re: [pgadmin-hackers] About our GSoC projects

2010-08-18 Thread Magnus Hagander
On Wed, Aug 18, 2010 at 00:18, Guillaume Lelarge wrote: > Le 17/08/2010 16:08, Magnus Hagander a écrit : >> On Tue, Aug 17, 2010 at 12:15 PM, Guillaume Lelarge >> wrote: >>> I can probably do that. I can create two repos, one for each project, on >>> my github account, apply the respective patch,

Re: [pgadmin-hackers] About our GSoC projects

2010-08-17 Thread Guillaume Lelarge
Le 17/08/2010 16:08, Magnus Hagander a écrit : > On Tue, Aug 17, 2010 at 12:15 PM, Guillaume Lelarge > wrote: So, my basic question is: how do we handle this? I know Luis is interested to continue to work on his project. I don't know for Adeel. Anyway, perhaps a good way to do

Re: [pgadmin-hackers] About our GSoC projects

2010-08-17 Thread Magnus Hagander
On Tue, Aug 17, 2010 at 12:15 PM, Guillaume Lelarge wrote: >>> So, my basic question is: how do we handle this? >>> >>> I know Luis is interested to continue to work on his project. I don't >>> know for Adeel. Anyway, perhaps a good way to do this is to create two >>> dev branches on the pgadmin r

Re: [pgadmin-hackers] About our GSoC projects

2010-08-17 Thread Guillaume Lelarge
Le 17/08/2010 11:56, Dave Page a écrit : > On Mon, Aug 16, 2010 at 9:20 PM, Guillaume Lelarge > wrote: >> [...] >> I'm wondering how we should handle the GSoC projects now. They both give >> us their patches, and in both of them, they are quite some work to do. >> >> I didn't do a lot of work on A

Re: [pgadmin-hackers] About our GSoC projects

2010-08-17 Thread Dave Page
On Mon, Aug 16, 2010 at 9:20 PM, Guillaume Lelarge wrote: > Hi, > > I'm wondering how we should handle the GSoC projects now. They both give > us their patches, and in both of them, they are quite some work to do. > > I didn't do a lot of work on Adeel's one, but there is at least a lot of > work