On 14 November 2013 21:14, Steve Holme <steve_holme_at_hotmail.com> wrote:

> Cheers for the patch Björn.

> With that in mind, I have pushed the patch for two reasons a) in an attempt
> to fix the Solaris FD leak and b) correct what we both feel is incorrect
> code.
>
> The only thing I'm not too sure about and would like to run by you is:[..]

Re. test-patches.. something I've been thinking about for some time is
that we could maybe have a test-branch in the Github repository where
we could push patches still under development. I could add additional
builds to my autobuild systems which builds from the test branch. I
run the Solaris, AIX, Tru64 and IRIX systems and those operating
systems may, as you have found, be difficult to get your hands on when
you want to test something.
The scenario would be that if you want to test a fix you push that
patch to the test branch, then monitor the autobuilds. For the test
branch I could run a single autobuild (with all features enabled)
several times a day so that the turnaround isn't so long. If there's
a problem with the patch you'll push a fix on top of that, and when ok
you would merge the patch and any additional patch-to-the-patch
patches to your local master branch and squash them into one good
patch which you can then push to the Github master branch. That way
all master branch patches would be clean.. unlike now, when we
sometimes even have code that won't compile.

At certain points it'll be necessary to merge the master to the test
branch to make sure that the test branch is enough in synch with
master to make it relevant. This part is the only part that demands a
bit more Git knowledge than the rest, to get it right.

What do you think? I guess for most of the development it's fine as
is, patches can still be tested on the master branch. But sometimes
(as when Yang tries to figure out a tricky autoconf problem) a lot of
iterations are needed to get it right and the git history (of master)
is not very useful to see how a certain problem was fixed.

-Tor

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2013-11-15