As some people should now, I've started to merge namecoin & bitcoin 0.8.
My first attempt was to pick a bitcoin 0.8 and include changes done between namecoin_at_the_fork and namecoin_latest_commit.
But, so many things have changed that I've put that idea aside, tonight.
I'm now starting a more step by step approch : take current namecoin & integrate all bitcoin commits one by one since version 0.3.24rc2.
This will be slow, repetitive, instructive on how bitcoin works now but I hope, in the end, more easy.
This represents 3400 commits to merge one by one, fix conflicts & check if it compiles (most slower part...)
Current work is available here and will be updated "regularely" :
https://github.com/khalahan/namecoin/tr ... merge_v0.8
Current work done represents 81 commits (around 2 hours of work, without any difficult commit).
Here is how I work :
One terminal proccess commits not existing in branch namecoin_merge_v0.8 and existing in branch bitcoin (I've imported a bitcoin branch in my namecoin respository).
Code: Select all
for CID in `tac <(git log namecoin_merge_v0.8..bitcoin --graph|grep -oE 'commit [a-f0-9]{40}'|cut -d' ' -f2)`; do git lg $CID -1; read -n1; git merge $CID; done
If there are conflicts, I fix them in another terminal and commit.
Then, I can continue with merging the next commit.
On another side, I have gitk (gui tool to show commits/logs), that list each commits of the bitcoin branch with diffs, then I can see before merging the commit if it concerns namecoin or not, may provoke conflicts, edit a lot of .h files which will slow compilation, etc.
Now, some questions :
- Do you think it is possible to work at several on this (work is sequential) ? Someone interested ?
- How much frenquently should I try to compile namecoind ?
- How much frenquently should I try launch namecoind to check if things are ok ?
- Which tests in namecoind should I do ?
So ?
[edit] 2013-06-24 - Version 0.4.0 :
Here are 32 & 64 bits releases for linux (compiled on debian6) :
http://dot-bit.org/files/temp/namecoind64_0.4.0
http://dot-bit.org/files/temp/namecoind32_0.4.0
See : https://dot-bit.org/forum/viewtopic.php?p=4424#p4424