aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2010-12-19 10:39:36 -0500
committerGavin Andresen <gavinandresen@gmail.com>2010-12-19 10:39:36 -0500
commitcba3a1741a8d7874eeb729bd2e1734b1ba712da9 (patch)
tree8f106cecb3e67492fedb9a6009b8b32ee3563be0
parent5568d82c26d59aa90df22a6ac0900a93a5731aaf (diff)
Straw-man for dev process
-rw-r--r--README.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/README.md b/README.md
index 4c8475c889..f13a79a987 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-Gavin's Bitcoin patches
-=======================
+Bitcoin integration/staging tree
-Branches here:
+Straw-man plan for Bitcoin development (open source vets, please slap me around and help make this better):
-* svn : up-to-date mirror of the 'production' Bitcoin (from http://sourceforge.net/projects/bitcoin/).
-* monitorreceived : Implements monitortransaction/monitorblocks/gettransaction/getblock RPC commands.
-* listtransactions: Implements new JSON-RPC command "listtransactions" (from jgarzik)
-* refundtransaction : Implements new JSON-RPC command "refundtransaction"
-* master : All of the above, merged together.
+Developers work in their own trees, then submit pull requests when they think their feature is ready.
+
+Requests get discussed (where? bitcoin forums?) and if there's broad consensus they're a good thing, well written, match coding style, etc. then they're merged into the 'master' branch.
+
+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.
+
+
+We'll create feature branches if/when there are major new features being worked on by several people.
-Code is hosted at github: http://github.com/gavinandresen/bitcoin-git