[tor-dev] Help with rebasing arma's n23-5 tor branch to current master
karsten at torproject.org
Thu Jul 18 12:50:31 UTC 2013
is anyone here up for a coding task that could help us research
performance improvements of the N23 design more?
The situation is that we already have a branch (n23-5 in arma's public
repository), but it's based on 0.2.4.3-alpha-dev and needs to be rebased
to current master.
In theory, it's as simple as the following steps:
$ git clone https://git.torproject.org/tor.git
$ cd tor/
$ git remote add arma https://git.torproject.org/arma/tor.git
$ git fetch arma
$ git checkout -b n23-5 arma/n23-5
$ git fetch origin
$ git rebase origin/master
(clean up the mess)
$ git add
$ git commit
$ git rebase --continue
(back to clean-up-the-mess step until git is happy)
$ git push public n23-5
Bonus points if you make sure the branch compiles with gcc warnings
enabled, appeases make check-spaces, and runs peacefully in a private
Unfortunately, the n23-5 branch touches a few places in the tor code
that have been refactored in current master, including Andrea's
connection/channel rewrite. It might be necessary to dive into the
channel thing in order to get this rebase right.
Once we have a refactored n23-5 branch, I'll try to simulate it in Shadow.
For a tiny bit of context, this is for our sponsor F item 13:
I'm asking here, because the usual suspects are already overloaded with
other stuff. As usual, I guess.
More information about the tor-dev