Hello developers, I'm looking for some experienced advice to improve my development workflow with freeswitch. I've got one Server where I've originally downloaded fs sources from the svn under the path /opt/software/freeswitch/src then I've configured it for installation in /opt/software/freeswitch in order to have everything under the same filesystem directory. Now a colleague of mine and me, do change something in freeswitch sources and configuration files. For some reasons we don't edit the files directly on the Server, instead we currently work on our desktop PC within Eclipse IDE. Since we don't compile the software on our desktop PCs but we compile it on the Server, we don't copy all the Freeswitch sources on our Eclipse workspace but only the files we actually need to change. For example if I need to change something in mod_sofia within "sofia_glue.c": 1) if it is the first time I edit this file: semi-manually download via scp the file under a workspace filesystem on my PC which resemble fs sources directory structure 2) commit this original unmodified version of the sofia_glue.c under a local subversion repository of mine which has nothing to do with svn.freeswitch.org 3) edit the file (this is the fun part :-) 4) deploy the file on the Server via ant "build.xml" 5) "make mod_sofia-install" on the Server 6) commit/update sofia_glue.c on my local subversion repository in order to share my patches with my colleague and keep track of changes and experiments As you may understand, my problem is that I want to stay in sync with latest, official, freeswitch svn tree. I would like to keep both my changes and the official freeswitch updates. Any hint on how to deal with this "scenario"? :-) Thanks a lot, Claudio Internet Email Confidentiality Footer ----------------------------------------------------------------------------------------------------- La presente comunicazione, con le informazioni in essa contenute e ogni documento o file allegato, e' rivolta unicamente alla/e persona/e cui e' indirizzata ed alle altre da questa autorizzata/e a riceverla. Se non siete i destinatari/autorizzati siete avvisati che qualsiasi azione, copia, comunicazione, divulgazione o simili basate sul contenuto di tali informazioni e' vietata e potrebbe essere contro la legge (art. 616 C.P., D.Lgs n. 196/2003 Codice in materia di protezione dei dati personali). Se avete ricevuto questa comunicazione per errore, vi preghiamo di darne immediata notizia al mittente e di distruggere il messaggio originale e ogni file allegato senza farne copia alcuna o riprodurne in alcun modo il contenuto. This e-mail and its attachments are intended for the addressee(s) only and are confidential and/or may contain legally privileged information. If you have received this message by mistake or are not one of the addressees above, you may take no action based on it, and you may not copy or show it to anyone; please reply to this e-mail and point out the error which has occurred. -----------------------------------------------------------------------------------------------------