On 12/03/2014 05:16 AM, Chuck McManis wrote: > So I've been cleaning up my repos so that I can provide better pulls for the > devs and while I'm in good shape with my LOC3 repo, my examples repo though > differs from upstream by the version of loc3 it has as its sub-project. The > difference looks like this: > > > -Subproject commit 02a5b6c7b22ccef382d6311e3f0dff5810e95220 > +Subproject commit 2c475a38d5fa22fbabbb576e0e6d4d547988ef4f > > > So presumably if I could set my loc3 to 02a5b6c it would consider it to be > 'identical' to upstream. > > Oddly, on github it shows loc3 at 67f450 which is different than my current > version, and 'git show-branch --sha1-name' on the loc3 director doesn't even > *have* a 67f450 commit. That does show up on github though as the Oct 8th > version that Karlp committed. > > So here is the random question, if i create a pull from an examples tree that > has a different loc3 commit is that "ok?" can you cherry-pick around it? Or > what? Not sure what the policy there should be. I thought I would be clever > and > add examples for the nucleo boards since I've got 3 different ones now, (L0, > F0, > and F4) and it seems like ST is handing them out at their talks so useful to > people showing up and discovering loc3.
I can work it out normally :) from the root of the libopencm3-examples repo, "git pull && git submodule update" is normally all you need. Cheers, Karl P ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ libopencm3-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/libopencm3-devel
