On Sun, Feb 3, 2013 at 12:18 AM, Christopher Wilson < [email protected]> wrote:
> Thanks for finding this. I'm not sure what else is broken so if you >> keep going that would be cool. I will be tweaking the document later >> tonight to fix the procedure. So please update and see if the new >> procedure works better. >> > > Sure thing. It's been a long time since I touched TinyOS, and I'm trying > to get back into it by setting up a dev environment on OSX (Mountain Lion). what mote are you trying to use? if msp430 based, let me know what you do exactly to get mspdebug working with the ti jtag pod. > > > The intent is your changes are concentrated on the >> gh:FlyingCampDesign/tinyos-**main(cw) branch. While >> gh:FlyingCampDesign/tinyos-**main(master) is used to continue to track >> the >> upstream from gh:tinyos/tinyos-main(master). So I don't think we need >> the gh:FlyingCampDesign/tinyos-**main(master-up) branch. You can always >> reference the upstream master branch via the reference up/master. >> >> As new changes come in from the mainline, you update your local copy of >> master by merging from up/master. It should always be a fast-forward. >> > > OK, this is starting to make more sense. > > Questions: > > 1) Since you can always reference the upstream master via up/master, why > the need to track it in roberthunter/tinyos-main(**master)? (i.e why > does roberthunter/tinyos-main(**master) need to exist?) It seems like > the recommended place for personal dev is roberthunter/tinyos-main(rh), so > it seems like extra chores to keep the roberthunter/tinyos-main(**master) > up to date when it's not really necessary? > If I remember correctly I ran into problems when trying to rebase using a remote branch hence the local copy of master. But that was a while ago on a much older version of git. We should see how simple we can make it using git 1.8. > > 2) So is the following workflow correct? > > [initial setup] > (fork repo) > $ git clone [email protected]:roberthunter/**tinyos-main.git tinyos-2.x > $ cd tinyos-2.x > > $ git remote add up > git://github.com/tinyos/**tinyos-main<http://github.com/tinyos/tinyos-main> > $ git fetch up > $ git checkout -b rh <- create personal branch > Need to consider refreshing the initial clone (which creates the local copy of master. The git checkout -b rh will create rh off what it considers to be the local copy of master and not the current value of what came in on the fetch from up. > > [daily workflow] > $ git checkout rh <- checkout personal branch > $ git fetch up <- grab the latest changes from > gh:tinyos/tinyos-main(master) > $ git rebase up/master <- rebase local(rh) branch onto latest changes in > up/master > If the above works, we should use it. But verify that it works. If you are into it, feel free to revise the docs describing this process, once we get something that works right. push them into your repo. If you have time. If not I will get to it. -- Eric B. Decker Senior (over 50 :-) Researcher
_______________________________________________ Tinyos-help mailing list [email protected] https://www.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos-help
