Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Dag Sverre Seljebotn
On 05/06/2011 08:20 AM, Vitja Makarov wrote: 2011/5/6 Robert Bradshaw: I don't like the default to be "don't pull from me"--I'd rather there be some convention to indicate a branch is being used as a queue. Maybe even foo-queue, or a leading underscore if people like that. On Thu, May 5, 2011 a

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Vitja Makarov
2011/5/6 Robert Bradshaw : > I don't like the default to be "don't pull from me"--I'd rather there > be some convention to indicate a branch is being used as a queue. > Maybe even foo-queue, or a leading underscore if people like that. > > On Thu, May 5, 2011 at 2:03 PM, Dag Sverre Seljebotn > wro

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Robert Bradshaw
I don't like the default to be "don't pull from me"--I'd rather there be some convention to indicate a branch is being used as a queue. Maybe even foo-queue, or a leading underscore if people like that. On Thu, May 5, 2011 at 2:03 PM, Dag Sverre Seljebotn wrote: > Yes, that is the only time it ha

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Dag Sverre Seljebotn
Yes, that is the only time it happens. Do we agree on a) ask before you pull anything that is not in cython/* (ie in private repos), b) document it in hackerguide? DS -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. Robert Bradshaw wrote: On Thu, May 5, 2011 at 1:22 P

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Robert Bradshaw
On Thu, May 5, 2011 at 1:22 PM, Stefan Behnel wrote: > Dag Sverre Seljebotn, 05.05.2011 21:52: >> >> There was just a messup in git history: Mark's OpenMP pull request got >> merged twice; all commits show up two times. > > What (I think) happened, was that Vitja pulled in Mark's changes into his

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread mark florisson
On 5 May 2011 22:22, Stefan Behnel wrote: > Dag Sverre Seljebotn, 05.05.2011 21:52: >> >> There was just a messup in git history: Mark's OpenMP pull request got >> merged twice; all commits show up two times. > > What (I think) happened, was that Vitja pulled in Mark's changes into his > unreachab

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Stefan Behnel
Dag Sverre Seljebotn, 05.05.2011 21:52: There was just a messup in git history: Mark's OpenMP pull request got merged twice; all commits show up two times. What (I think) happened, was that Vitja pulled in Mark's changes into his unreachable code removal branch, and they ended up in his pull r

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Dag Sverre Seljebotn
On 05/05/2011 10:09 PM, mark florisson wrote: On 5 May 2011 21:52, Dag Sverre Seljebotn wrote: There was just a messup in git history: Mark's OpenMP pull request got merged twice; all commits show up two times. It doesn't matter, since the two openmp branches with the same changes merged OK, b

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread Stefan Behnel
mark florisson, 05.05.2011 22:09: I think the rebasing is pretty elegant, so I'm +1 on that, as long as everyone agrees because those duplicated commits are nasty. I'm surprised git didn't issue an error to prevent this. I'm not surprised at all. Stefan

Re: [Cython] Git workflow, branches, pull requests

2011-05-05 Thread mark florisson
On 5 May 2011 21:52, Dag Sverre Seljebotn wrote: > There was just a messup in git history: Mark's OpenMP pull request got > merged twice; all commits show up two times. > > It doesn't matter, since the two openmp branches with the same changes > merged OK, but we shouldn't make this a habit. For i

[Cython] Git workflow, branches, pull requests

2011-05-05 Thread Dag Sverre Seljebotn
There was just a messup in git history: Mark's OpenMP pull request got merged twice; all commits show up two times. It doesn't matter, since the two openmp branches with the same changes merged OK, but we shouldn't make this a habit. For instance, the openMP commits also show up as part of vit

Re: [Cython] [SciPy-User] Scikits.sparse build issue

2011-05-05 Thread Nathaniel Smith
Whoops, looks like we passed each other :-) My patch has a few other fixes you might want to apply too, since I figured I should probably double-check the rest of the 'enum's in there too -- I don't know if they'd cause problems in practice, but... On Thu, May 5, 2011 at 11:46 AM, Dag Sverre Selj

Re: [Cython] [SciPy-User] Scikits.sparse build issue

2011-05-05 Thread Dag Sverre Seljebotn
On 05/05/2011 08:42 PM, Nathaniel Smith wrote: On Thu, May 5, 2011 at 3:03 AM, Anand Patil wrote: On May 4, 8:16 pm, Nathaniel Smith wrote: On Tue, May 3, 2011 at 10:10 AM, Nathaniel Smith wrote: On Tue, May 3, 2011 at 5:51 AM, Anand Patil wrote: scikits/sparse/cholmod.c: In function ‘

Re: [Cython] Hudson pyregr testing takes too long

2011-05-05 Thread Stefan Behnel
Vitja Makarov, 05.05.2011 16:29: 2011/5/5 Stefan Behnel: Vitja Makarov, 05.05.2011 08:41: Recently I've found that pyregr.test_dict (test_mutatingiteration) test makes it slow: def test_mutatingiteration(): d = {} d[1] = 1 for i in d: print i d[i+1] = 1 test_

Re: [Cython] Hudson pyregr testing takes too long

2011-05-05 Thread Vitja Makarov
2011/5/5 Stefan Behnel : > Vitja Makarov, 05.05.2011 08:41: >> >> Recently I've found that pyregr.test_dict (test_mutatingiteration) >> test makes it slow: >> >> def test_mutatingiteration(): >>     d = {} >>     d[1] = 1 >>     for i in d: >>         print i >>         d[i+1] = 1 >> >> test_mutati

Re: [Cython] Hudson pyregr testing takes too long

2011-05-05 Thread Stefan Behnel
Vitja Makarov, 05.05.2011 08:41: Recently I've found that pyregr.test_dict (test_mutatingiteration) test makes it slow: def test_mutatingiteration(): d = {} d[1] = 1 for i in d: print i d[i+1] = 1 test_mutatingiteration() In CPython this code raises: RuntimeEr