LScube

Sometimes because we want to move some code from application to a common library (e.g. bufferpool used by feng and felix ) we need to update our application in a certain number of steps, this is a bare promemoria.

ALWAYS WORK IN SEPARATE BRANCHES

• If the code doesn't have an history to be preserved (e.g. few functional commits) just add it to the code in a single commit
• if you want to preserve the history
  • make a patch series with git-format-path with just the changes related to the files of interest
  • use git-apply to add the code.
• in a second commit update the build system and local code to work with the freshly imported one MAKE SURE YOU BUMP THE VERSION
  • check the Makefile.am
  • check the configure.ac
  • make sure all the headers are ok and the paths make sense
  • make sure everything builds
• merge the branch to the master.