Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
doc:gayas-random-stuff [2013/12/11 18:55] – gkazhoyadoc:gayas-random-stuff [2014/03/18 18:48] (current) – gkazhoya
Line 42: Line 42:
 Hotkeys : Hotkeys :
  
-C-c C-d d   describe slime variable+C-c C-d d   describe \\
 C-h b      list all bindings. Then C-s slime. C-h b      list all bindings. Then C-s slime.
- 
  
 ----- -----
  
 +[[http://cram-system.org/doc/patmatch|Pattern matching]]
 +
 +------
 +=== Git stuff ===
 +cherry-pick remote branch commits:
 +
 +<code bash>
 +git fetch my-remote-branch-name (e.g. upstream)
 +git cherry-pick sha-of-commit
 +</code>
 +
 +--
 +
 +As upstream for your repo set your fork on GitHub and use ''git@github.com:yourusername/forkedrepo.git'' instead of ''https://github.com/yourusername/forkedrepo.git'' so that it uses your RSA keypairs for authentication instead of asking password each time you push.R: /home/gkazhoya/workspace/rosbuild/mongo_prolog/prolog/init.pl:23:
 + source_sink `library(xpce_ex)' does not exist
 +Warning: /home/gkazhoya/workspace/rosbuild/mongo_prolog/prolog/init.pl:23:
 + Goal (directive) failed: user:use_module(library(xpce_ex))
 +%  /home/gkazhoya/workspace/rosbuild/mongo_prolog/prolog/init.pl compiled 0.01 sec, 313,224 bytes
 +ERROR: /home/gkazhoya/workspace/rosbuild/mongo_prolog/prolog/init.pl:23:
 + source_sink `library(xpce_ex)' does not exist
 +
 +--
 +
 +Moving dir to another repo with history
 +
 +<code bash>
 +  cd /tmp
 +  git clone https://github.com/cram-code/REPO.git
 +  cd REPO
 +  git filter-branch --prune-empty --subdirectory-filter MY_DIR -- --all
 +  git filter-branch --force --index-filter 'git ls-files -s | sed "s-\t\"*-&newsubdir/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
 +                                    
 +  roscd REPO2
 +  git remote add tmp /tmp/REPO
 +  git pull tmp
 +  git commit --amend --vm "Moved MY_DIR here from REPO"
 +  git remote rm tmp
 +</code>
 +
 +---
 +
 +When installing both moveit full (including mongo-db deps) and mongodb-10gen, both try to write to the same file. So, force the overwrite when installing the second of the mongodb packages: http://www.webupd8.org/2011/02/fix-dpkg-error-trying-to-overwrite-x.html
 +
 +
 +---
  
 +Installing Andrei's system:
  
 +  * make sure full knowrob installation is provided
 +  * install mongodb-10gen (just google for "install mongodb" for ubuntu)
 +  * import a database into your mongodb: mongoimport --db sim_db --collection collection_X THE-FILE-ANDREI-CREATED-FOR-YOU-BY-EXPORTING
 +  * get Andrei's code from bitbucket: git clone https://bitbucket.org/ahaidu/mongo_prolog.git (or wstool whatever, it's rosmake atm)
 +(it's a private repo, you'll need to ask andrei for access)
 +  * rosrun rosprolog rosprolog mongo_prolog
 +  * make.
 +  * add_world_clauses.
 +  * in another terminal: roslaunch mongo_prolog mTAB
  
  
 +---
 +Running Daniel's stuff
 +source env.sh from the root
 +pracmln from the correct examples directory