You are here: start » devel » import-k-module

Differences

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

Link to this comparison view

Next revision 		Previous revision
devel:import-k-module [2009/04/03 16:15]
86.121.133.103 created 		devel:import-k-module [2012/11/11 16:59] (current)
oej old revision restored
Line 5: Line 5:
 First off, make sure you have a local copy of the sip-router git repository with Kamailio history merged into it. You can find a step-by-step guide at [[git:gitconfig|Annotated git configuration file]]. First off, make sure you have a local copy of the sip-router git repository with Kamailio history merged into it. You can find a step-by-step guide at [[git:gitconfig|Annotated git configuration file]].
  
-I suppose that the module you want to import into the git repository will be based on the sources present in the kamailio svn trunk, so as the next step create a new branch based on the Kamailio trunk:+It is supposed that the module you want to import into the git repository will be based on the sources present in the kamailio svn trunk, so as the next step create a new branch based on the Kamailio trunk:
  
 <code> <code>
Line 11: Line 11:
 </code> </code>
  
-The name of the new branch is sqlops_filtered because I am importing Kamailio sqlops module, "_filtered" because this branch will be used to filter commits.+The name of the new branch is sqlops_filtered because it is imported Kamailio sqlops module, "_filtered" because this branch will be used to filter commits.
  
 Like revision numbers in svn (and unlike versions in cvs), git commits, identified by those cryptic sha1 hashes, record the state of _all_ files in the source tree at the time when the commit was made. But this is a problem Like revision numbers in svn (and unlike versions in cvs), git commits, identified by those cryptic sha1 hashes, record the state of _all_ files in the source tree at the time when the commit was made. But this is a problem
Line 24: Line 24:
 The command rewrite the history of the current branch, your current branch should be sqlops_filtered if you followed this guide from the beginning. If you investigate the history of the branch with git log, you should see only commits that are related to files in modules/sqlops. (The module contained only one commit at the time of writing of this memo so don't be surprised if you only see one commit in the history). The command rewrite the history of the current branch, your current branch should be sqlops_filtered if you followed this guide from the beginning. If you investigate the history of the branch with git log, you should see only commits that are related to files in modules/sqlops. (The module contained only one commit at the time of writing of this memo so don't be surprised if you only see one commit in the history).
  
-If you examine your current working directory now, you'll notice that the directory contains files from modules/sqlops in the top level directory. We need to put them back into modules/sqlopts before we can merge the branch into sip-router tree, this can be done with git-filter-branch again. But before we can run the command second time, we need to remove some residual files from the previous run:+If you examine your current working directory now, you'll notice that the directory contains files from modules/sqlops in the top level directory. We need to put them back into modules/sqlops before we can merge the branch into sip-router tree, this can be done with git-filter-branch again. But before we can run the command second time, we need to remove some residual files from the previous run:
  
 <code> <code>

Trace:

Navigation

Wiki

Other

QR Code
QR Code devel:import-k-module (generated for current page)