On Fri, Jul 1, 2011 at 7:29 AM, Øyvind Harboe <[email protected]> wrote: > Looks good to me! > > Please put it into your mips branch and post a pull request once > everything is ready. I know you were working on something else too.
Hi Øyvind, I forked a branch from current master HEAD and pushed all the code to my github (https://github.com/drasko/openocd) : git://github.com/drasko/openocd.git https://[email protected]/drasko/openocd.git Then I : 1) hard-reset to HEAD~1, because current master breaks on jimtcl configure and can not build (I wrote about this previously) : > git-reset --hard HEAD~1 2) I did the changes on src/mips_m4k.c by adding the missing line, as I described. Compiled, tested, everything works fine. 3) I commited the changes 4) Rebased to origin/master 5) Pushed changes to my github branch This way my branch should be rebased to OpenOCD master and should contain my last patch - fix for MIPS soft breakpoint endianess handling. I suggest you at this moment that we test all this environment by pulling this branch and integrating the patch because : 1) this will prove that I have good environment and everything set-up for further maintenance of this branch 2) change I introduced is independent on cache handling I am currently working on, which is more tricky and should be integrated in the separate merge. I will be sending pull request in a separate post. If this all passes OK, I will add a small doc similar to yours HACKING which will serve us for the reference on this procedure - creating separate branches, doing changes, sending pull requests, etc... because before we all just sent the gti-formated patches to you. Also, I have one question : when I work on this brranch, how will be doing interation after, i.e. do I have to rebase this branch to OpenOCD sourceforge origin/master so that all my changes come on the top of it before sending a pull request or someone will just pull the branch and do the merge ? Can you explain in a few words the whole methodology on work on separate branches like this ? Based on your explanations I'll try to craft a doc further on. Thanks and best regards, Drasko _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
