On 10-4-2017 15:52, Sage Weil wrote: > On Mon, 10 Apr 2017, Willem Jan Withagen wrote: >> On 10-4-2017 15:36, Sage Weil wrote: >>> On Mon, 10 Apr 2017, Willem Jan Withagen wrote: >>>> Hi, >>>> >>>> I have submitted a PR to RocksDB that got accepted. >>>> But now I'd like to try it in my WIP tree. >>>> >>>> So how do I locally roll the RocksDB version forward? >>>> >>>> Is it as simple as going into RocksDB and go: >>>> 'git pull' ?? >>> >>> It depends on what remotes you have in the rocksdb repository; you may >>> have to 'git remote add upstream https://github.com/facebook/rocksdb' and >>> fetch that first. >> >> Uptil now I avoided cloning RocksDB and submitted PRs fully thru GitHub ;-) >> >>> Once you get the submodule on the right commit, you'll need to make a >>> commit in the containing ceph.git updating the submodule sha1. (I usually >>> use 'git gui' for this.) >> >> There is not that many updates to RocksDB, And my PR-commit is the >> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39 >> >> So how do I forward the submodule to this SHA? > > Yeah, that makes sense! Right, But that did hot answer the penultimate question: How to do it? And most of the git help I can find, does not seem to have effect on my current tree. Where the last commit seems to be from 7 feb.... Which is the date (I guess) the inclusion of RocksDB is rolled forward. Or is RocksDB always at HEAD, if everything is fetched anew? --WjW -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
