You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by Steve Huston <sh...@riverace.com> on 2008/06/05 01:12:47 UTC

Git repository up for qpid ports

Hi folks,

I created a git repository for qpid porting efforts. The svn trunk as
of ~30 minutes ago is the master in git. I suggest that we create a
branch for each port, unless Manuel wants to rebase his Solaris port
on the refactoring I did for Windows. Of course, I'd rather have it go
that way, but we could also just each do a git branch and go and then
synch them up later.

For discussions on issues that arise, let's keep things here on this
list rather than on the git-based wiki stuff. Ok?

The git repo is at git://github.com/shuston/qpid-port.git

After we get some concensus on whether or not to start from the
Windows refactor, I'll add the Windows stuff in.

-Steve



Re: Git repository up for qpid ports

Posted by Manuel Teira <mt...@tid.es>.
Robert Greig escribió:
> 2008/6/5 Manuel Teira <mt...@tid.es>:
>
>   
>> Hmm, I'm afraid my enterprise firewall is avoiding me to use the git
>> protocol directly. I've been taking a look at the github page, but I wasn't
>> able to figure out if they are providing http access to the repositories.
>>
>> Damn, compiling and installing git properly on solaris was not a cake.
>>     
>
> Not sure if this helps - it will depend how your web proxy is set up:
> http://lkml.org/lkml/2006/2/26/207
>   
Thanks for the hint, Robert. Unfortunately it seems that the proxy is 
not accepting CONNECT requests to the git port. I finally was able to 
find a way using some ssh spells and redirections.

--
Manuel.

> RG
>
>   


Re: Git repository up for qpid ports

Posted by Robert Greig <ro...@gmail.com>.
2008/6/5 Manuel Teira <mt...@tid.es>:

> Hmm, I'm afraid my enterprise firewall is avoiding me to use the git
> protocol directly. I've been taking a look at the github page, but I wasn't
> able to figure out if they are providing http access to the repositories.
>
> Damn, compiling and installing git properly on solaris was not a cake.

Not sure if this helps - it will depend how your web proxy is set up:
http://lkml.org/lkml/2006/2/26/207

RG

Re: Git repository up for qpid ports

Posted by Manuel Teira <mt...@tid.es>.
Steve Huston escribió:
>> -----Original Message-----
>> From: aidan.skinner@gmail.com
>> [mailto:aidan.skinner@gmail.com] On Behalf Of Aidan Skinner
>> Sent: Thursday, June 05, 2008 8:12 AM
>> To: qpid-dev@incubator.apache.org
>> Subject: Re: Git repository up for qpid ports
>>
>>
>> On Thu, Jun 5, 2008 at 1:05 PM, Steve Huston
>> <sh...@riverace.com> wrote:
>>
>>     
>>> Hi Aidan,
>>>
>>>       
>>>> On Thu, Jun 5, 2008 at 12:12 AM, Steve Huston
>>>> <sh...@riverace.com> wrote:
>>>>         
>>>> Sweet! Is there a http url that can be used for those times one
>>>>         
>>> finds
>>>       
>>>> oneself unable to access git://?
>>>>         
>>> You can try this one...
>>> http://github.com/shuston/qpid-port/tree/master
>>>       
>> I think that's just an html interface, I can't clone off it :/
>>     
>
> The page lists git://github.com/shuston/qpid-port.git as the clone
> URL... I'm a git-newbie, so I know no more than what's on that web
> page ;-)
>
>   
Hmm, I'm afraid my enterprise firewall is avoiding me to use the git 
protocol directly. I've been taking a look at the github page, but I 
wasn't able to figure out if they are providing http access to the 
repositories.

Damn, compiling and installing git properly on solaris was not a cake.

> -Steve
>
>
>
>   


RE: Git repository up for qpid ports

Posted by Steve Huston <sh...@riverace.com>.
> -----Original Message-----
> From: aidan.skinner@gmail.com 
> [mailto:aidan.skinner@gmail.com] On Behalf Of Aidan Skinner
> Sent: Thursday, June 05, 2008 8:12 AM
> To: qpid-dev@incubator.apache.org
> Subject: Re: Git repository up for qpid ports
> 
> 
> On Thu, Jun 5, 2008 at 1:05 PM, Steve Huston 
> <sh...@riverace.com> wrote:
> 
> > Hi Aidan,
> >
> >> On Thu, Jun 5, 2008 at 12:12 AM, Steve Huston
> >> <sh...@riverace.com> wrote:
> 
> >> Sweet! Is there a http url that can be used for those times one
> > finds
> >> oneself unable to access git://?
> >
> > You can try this one...
> > http://github.com/shuston/qpid-port/tree/master
> 
> I think that's just an html interface, I can't clone off it :/

The page lists git://github.com/shuston/qpid-port.git as the clone
URL... I'm a git-newbie, so I know no more than what's on that web
page ;-)

-Steve



Re: Git repository up for qpid ports

Posted by Aidan Skinner <ai...@apache.org>.
On Thu, Jun 5, 2008 at 1:05 PM, Steve Huston <sh...@riverace.com> wrote:

> Hi Aidan,
>
>> On Thu, Jun 5, 2008 at 12:12 AM, Steve Huston
>> <sh...@riverace.com> wrote:

>> Sweet! Is there a http url that can be used for those times one
> finds
>> oneself unable to access git://?
>
> You can try this one...
> http://github.com/shuston/qpid-port/tree/master

I think that's just an html interface, I can't clone off it :/

- Aidan

-- 
aim/y!:aidans42 g:aidan.skinner@gmail.com
http://aidan.skinner.me.uk/
"We belong to nobody and nobody belongs to us. We don't even belong to
each other."

RE: Git repository up for qpid ports

Posted by Steve Huston <sh...@riverace.com>.
Hi Aidan,

> On Thu, Jun 5, 2008 at 12:12 AM, Steve Huston 
> <sh...@riverace.com> wrote:
> 
> > I created a git repository for qpid porting efforts. The 
> svn trunk as
> 
> > The git repo is at git://github.com/shuston/qpid-port.git
> 
> Sweet! Is there a http url that can be used for those times one
finds
> oneself unable to access git://?

You can try this one...
http://github.com/shuston/qpid-port/tree/master

-Steve



Re: Git repository up for qpid ports

Posted by Aidan Skinner <ai...@apache.org>.
On Thu, Jun 5, 2008 at 12:12 AM, Steve Huston <sh...@riverace.com> wrote:

> I created a git repository for qpid porting efforts. The svn trunk as

> The git repo is at git://github.com/shuston/qpid-port.git

Sweet! Is there a http url that can be used for those times one finds
oneself unable to access git://?

- A
-- 
aim/y!:aidans42 g:aidan.skinner@gmail.com
http://aidan.skinner.me.uk/
"We belong to nobody and nobody belongs to us. We don't even belong to
each other."

Re: Git repository up for qpid ports

Posted by Alan Conway <ac...@redhat.com>.
Steve Huston wrote:
> Hi Carl,
> 
>>> The git repo is at git://github.com/shuston/qpid-port.git
>>>
>>> After we get some concensus on whether or not to start from the
>>> Windows refactor, I'll add the Windows stuff in.
>> It will also be good to work out when we want to merge the work.
> i.e. 
>> wait till it
>> all works, or bring it in in pieces as they are good and they don't 
>> break any existing builds.
> 
> That's one for you folks who will actually have to apply the patches
> to think about... It seems as though Manuel's Solaris changes are
> doing very well and will cause the least upset, so maybe that one can
> go first.
> 
I'm in favour of getting things in to trunk as soon as they are passing all the 
tests and believed to be solid. That way further development on trunk will take 
account of the porting  and not trample on it.

Re: Git repository up for qpid ports

Posted by Manuel Teira <mt...@tid.es>.
Carl Trieloff escribió:
>> That's one for you folks who will actually have to apply the patches
>> to think about... It seems as though Manuel's Solaris changes are
>> doing very well and will cause the least upset, so maybe that one can
>> go first.
>>     
Well, not that sure now. The poller seems to work, but once I faked the 
mutex initializer to go on even on failure, I found that the test_unit 
crashed miserably with both SIGBUS or SIGSEGV, always trying to allocate 
memory. Perhaps it's related with invalid mutexes, but I'm not still 
sure. We will see once the mutex bug is ironed. On the other hand, the 
broker starts and  I was able to use a client on it, without problems, 
apparently.

>> -Steve
>>
>>
>>
>>     
>
> Ack. will probably need to get a machine up to test that the merge does
> not get broken
> as we merge. or to start we could just make sure linux does not break,
> and then let Manuel
> check the Solaris build each time after a merge. I could chase a machine
> down - but that
> will take a few days. thoughts?
>
> Are you doing x86 or SPARC?
>   
Sparc, 64 bits builds.

Regards.
--
Manuel.



Re: Git repository up for qpid ports

Posted by Carl Trieloff <cc...@redhat.com>.
>
> That's one for you folks who will actually have to apply the patches
> to think about... It seems as though Manuel's Solaris changes are
> doing very well and will cause the least upset, so maybe that one can
> go first.
>
> -Steve
>
>
>   

Ack. will probably need to get a machine up to test that the merge does 
not get broken
as we merge. or to start we could just make sure linux does not break, 
and then let Manuel
check the Solaris build each time after a merge. I could chase a machine 
down - but that
will take a few days. thoughts?

Are you doing x86 or SPARC?
Carl.


RE: Git repository up for qpid ports

Posted by Steve Huston <sh...@riverace.com>.
Hi Carl,

> > The git repo is at git://github.com/shuston/qpid-port.git
> >
> > After we get some concensus on whether or not to start from the
> > Windows refactor, I'll add the Windows stuff in.
> 
> It will also be good to work out when we want to merge the work.
i.e. 
> wait till it
> all works, or bring it in in pieces as they are good and they don't 
> break any existing builds.

That's one for you folks who will actually have to apply the patches
to think about... It seems as though Manuel's Solaris changes are
doing very well and will cause the least upset, so maybe that one can
go first.

-Steve



Re: Git repository up for qpid ports

Posted by Carl Trieloff <cc...@redhat.com>.
Steve Huston wrote:
> Hi folks,
>
> I created a git repository for qpid porting efforts. The svn trunk as
> of ~30 minutes ago is the master in git. I suggest that we create a
> branch for each port, unless Manuel wants to rebase his Solaris port
> on the refactoring I did for Windows. Of course, I'd rather have it go
> that way, but we could also just each do a git branch and go and then
> synch them up later.
>   

great

> For discussions on issues that arise, let's keep things here on this
> list rather than on the git-based wiki stuff. Ok?
>   

yes, that way we can all comment/chirp and generally provide a bunch of 
views
that may or may not be helpful :-)

ok seriously, list is the right way to do it.

> The git repo is at git://github.com/shuston/qpid-port.git
>
> After we get some concensus on whether or not to start from the
> Windows refactor, I'll add the Windows stuff in.
>
>
>   

It will also be good to work out when we want to merge the work. i.e. 
wait till it
all works, or bring it in in pieces as they are good and they don't 
break any existing builds.

Carl.



Re: Git repository up for qpid ports

Posted by Andrew Stitcher <as...@redhat.com>.
On Wed, 2008-06-04 at 19:12 -0400, Steve Huston wrote:
> Hi folks,
> 
> I created a git repository for qpid porting efforts. The svn trunk as
> of ~30 minutes ago is the master in git. I suggest that we create a
> branch for each port, unless Manuel wants to rebase his Solaris port
> on the refactoring I did for Windows. Of course, I'd rather have it go
> that way, but we could also just each do a git branch and go and then
> synch them up later.

I'd agree with the branch for each port as it will still be possible to
create a merging branch from that as well, but if we base one port on
the other then it will no longer be possible.

Also Manuel's code besides the small things to make it compile under
Solaris is very much in the same vain is the current code whereas
Steve's patch is much bigger.

If I had to guess I'd say that (once we've resolved the dynamic_cast
problem one way or another) it would be simple to merge the Solaris port
without a major fuss, but the Windows port is much more intrusive so
will demand more thinking/scrutiny.

> 
> For discussions on issues that arise, let's keep things here on this
> list rather than on the git-based wiki stuff. Ok?
> 
> The git repo is at git://github.com/shuston/qpid-port.git
> 
> After we get some concensus on whether or not to start from the
> Windows refactor, I'll add the Windows stuff in.

I'd create a branch for the windows port anyway - we can always merge
things later when we decide to.

Incidentally in case it isn't clear yet, one of the major benefits of
git is that it has extremely good support for tracking merges between
branches, so it makes more sense to start with separate branches then
merge them.

Andrew



Re: Git repository up for qpid ports

Posted by Carl Trieloff <cc...@redhat.com>.
> Since Manuel and I do not have svn commit access, we will (if I
> understand this correctly) need to create a patch (and I think git
> will make this fairly easy), open a new jira issue and attach the
> patch to it. Then someone with svn commit has to review things and
> apply the patch to svn.
>
>   

Correct, In terms of getting commit access, this is how we do it:
http://cwiki.apache.org/qpid/getting-involved.html
If you have questions please ask, but based on the section 'Becoming a 
committer' usually the
person that has applied a bunch of the patches and PPMC member will 
nominate the individual to
become a committer on the private list. Once a committer, to get onto 
the PPMC while
still in incubator, all you have to do is ask. After that it will be by 
vote.

I had spoken to andrew a bit about the ports and he indicated that he 
might try start
merging the work in about a week when he has completed the current piece 
he is working
on. If he is going to volunteer, he is probably the one you want doing 
it as he is one of our IO
masters on Qpid.

thanks for all the work so far on Qpid!
Carl.



RE: Git repository up for qpid ports

Posted by Steve Huston <sh...@riverace.com>.
Hi folks,

> Steve Huston escribió:
> > Hi folks,
> >
> > I created a git repository for qpid porting efforts. The 
> svn trunk as
> > of ~30 minutes ago is the master in git. I suggest that we create
a
> > branch for each port, unless Manuel wants to rebase his Solaris
port
> > on the refactoring I did for Windows. Of course, I'd rather 
> have it go
> > that way, but we could also just each do a git branch and 
> go and then
> > synch them up later.
> >   
> Good work! I will have to spend some time learning something 
> about git. Any recommended reference?

http://git.or.cz/ has documentation and downloads. FYI, I had to
download the source for RHEL 4 and build it - the RPM relies on older
libc. When building, I also had to get subversion-perl (but
fortunately that one was available from RHN). On Solaris you'll have
to build it from source.

You and me will both be learning git together ;-) so I'm sure it'll be
interesting.

> About refactoring my code. Well, actually, my code is nearly the
same 
> than what's in trunk, other than some conditional includes 
> and the new 
> Poller, that could be even commited to the trunk without fuss, as it

> won't be compiled by default.

Ok, let's do separate Solaris and Windows branches in git then.

>From what I understand of the git-svn stuff, it's easy to pull svn
updates.

> BTW, what is the workflow on git to merge with an external 
> repository. I 
> assume that we will have to do frequently merges of the qpid 
> svn trunk, to be up to date.

Since Manuel and I do not have svn commit access, we will (if I
understand this correctly) need to create a patch (and I think git
will make this fairly easy), open a new jira issue and attach the
patch to it. Then someone with svn commit has to review things and
apply the patch to svn.

-Steve



Re: Git repository up for qpid ports

Posted by Manuel Teira <mt...@tid.es>.
Steve Huston escribió:
> Hi folks,
>
> I created a git repository for qpid porting efforts. The svn trunk as
> of ~30 minutes ago is the master in git. I suggest that we create a
> branch for each port, unless Manuel wants to rebase his Solaris port
> on the refactoring I did for Windows. Of course, I'd rather have it go
> that way, but we could also just each do a git branch and go and then
> synch them up later.
>   
Good work! I will have to spend some time learning something about git. 
Any recommended reference?

About refactoring my code. Well, actually, my code is nearly the same 
than what's in trunk, other than some conditional includes and the new 
Poller, that could be even commited to the trunk without fuss, as it 
won't be compiled by default.

> For discussions on issues that arise, let's keep things here on this
> list rather than on the git-based wiki stuff. Ok?
>   
ok.

> The git repo is at git://github.com/shuston/qpid-port.git
>
> After we get some concensus on whether or not to start from the
> Windows refactor, I'll add the Windows stuff in.
>   
I also agree with starting on different branches to eventually merge on 
a shared one.

Once I iron some remaining bugs that arised while trying to run the test 
unit on solaris, I will take a look at some git stuff and will try to 
create a branch on that repository and commit my work.

BTW, what is the workflow on git to merge with an external repository. I 
assume that we will have to do frequently merges of the qpid svn trunk, 
to be up to date.

Best regards.

--
Manuel.

> -Steve
>
>
>
>