Go to file
Gavin Andresen 6cc4a62c0e Fix rpc-hanging deadlocks
Collapsed multiple wallet mutexes to a single cs_wallet, to avoid deadlocks with wallet methods that acquired locks in different order.
Also change master RPC call handler to acquire cs_main and cs_wallet locks before executing RPC calls; requiring each RPC call to acquire the right set of locks in the right order was too error-prone.
2011-08-31 12:55:16 -04:00
contrib Add reference python miner, in contrib/pyminer/ 2011-08-31 12:27:41 -04:00
doc Merge pull request #463 from TheBlueMatt/encreadme 2011-08-31 09:32:42 -07:00
locale Merge pull request #475 from ovdeathiam/patch-1 2011-08-31 09:23:30 -07:00
share Make it clear that setting proxy requires restart to fully apply. 2011-08-03 21:02:07 +02:00
src Fix rpc-hanging deadlocks 2011-08-31 12:55:16 -04:00
.gitignore Add common temp files to .gitignore. 2011-06-02 20:27:27 -05:00
COPYING directory re-organization (keeps the old build system) 2011-04-23 12:10:25 +02:00
README directory re-organization (keeps the old build system) 2011-04-23 12:10:25 +02:00
README.md Updated development process description 2011-01-21 10:52:48 -05:00

README.md

Bitcoin integration/staging tree

Development process

Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready.

If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it.

If it is a more complicated or potentially controversial change, then the patch submitter will be asked to start a discussion (if they haven't already) on the development forums: http://www.bitcoin.org/smf/index.php?board=6.0 The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial.

The master branch is regularly built and tested (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin.

Feature branches are created when there are major new features being worked on by several people.