development workflow adjustment
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. -----------------------------------------------------------------------------------------------------
Use emacs and screen on the server itself and ditch your IDE. Works rather well for us! /b On Jun 17, 2009, at 8:53 AM, Cavalera Claudio Luigi wrote:
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"? :-)
freeswitch-dev-bounces@lists.freeswitch.org wrote:
Use emacs and screen on the server itself and ditch your IDE. Works rather well for us!
This is what I used to do, but then how could I commit my changes also on my local repository? Or do you think that I should give up with this idea? Ciao, 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. -----------------------------------------------------------------------------------------------------
One way would be to share your patches with us. The other would be to not edit any of the files. On Wed, Jun 17, 2009 at 8:53 AM, Cavalera Claudio Luigi < Claudio.Cavalera@italtel.it> wrote:
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.
-----------------------------------------------------------------------------------------------------
_______________________________________________ Freeswitch-dev mailing list Freeswitch-dev@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-dev http://www.freeswitch.org
-- Anthony Minessale II FreeSWITCH http://www.freeswitch.org/ ClueCon http://www.cluecon.com/ AIM: anthm MSN:anthony_minessale@hotmail.com <MSN%3Aanthony_minessale@hotmail.com> GTALK/JABBER/PAYPAL:anthony.minessale@gmail.com<PAYPAL%3Aanthony.minessale@gmail.com> IRC: irc.freenode.net #freeswitch FreeSWITCH Developer Conference sip:888@conference.freeswitch.org <sip%3A888@conference.freeswitch.org> iax:guest@conference.freeswitch.org/888 googletalk:conf+888@conference.freeswitch.org<googletalk%3Aconf%2B888@conference.freeswitch.org> pstn:213-799-1400
oh, and you could ask for a development branch and merge in svn trunk once in a while. On Wed, Jun 17, 2009 at 9:03 AM, Anthony Minessale < anthony.minessale@gmail.com> wrote:
One way would be to share your patches with us. The other would be to not edit any of the files.
On Wed, Jun 17, 2009 at 8:53 AM, Cavalera Claudio Luigi < Claudio.Cavalera@italtel.it> wrote:
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.
-----------------------------------------------------------------------------------------------------
_______________________________________________ Freeswitch-dev mailing list Freeswitch-dev@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-dev http://www.freeswitch.org
-- Anthony Minessale II
FreeSWITCH http://www.freeswitch.org/ ClueCon http://www.cluecon.com/
AIM: anthm MSN:anthony_minessale@hotmail.com <MSN%3Aanthony_minessale@hotmail.com> GTALK/JABBER/PAYPAL:anthony.minessale@gmail.com<PAYPAL%3Aanthony.minessale@gmail.com> IRC: irc.freenode.net #freeswitch
FreeSWITCH Developer Conference sip:888@conference.freeswitch.org <sip%3A888@conference.freeswitch.org> iax:guest@conference.freeswitch.org/888 googletalk:conf+888@conference.freeswitch.org<googletalk%3Aconf%2B888@conference.freeswitch.org> pstn:213-799-1400
-- Anthony Minessale II FreeSWITCH http://www.freeswitch.org/ ClueCon http://www.cluecon.com/ AIM: anthm MSN:anthony_minessale@hotmail.com <MSN%3Aanthony_minessale@hotmail.com> GTALK/JABBER/PAYPAL:anthony.minessale@gmail.com<PAYPAL%3Aanthony.minessale@gmail.com> IRC: irc.freenode.net #freeswitch FreeSWITCH Developer Conference sip:888@conference.freeswitch.org <sip%3A888@conference.freeswitch.org> iax:guest@conference.freeswitch.org/888 googletalk:conf+888@conference.freeswitch.org<googletalk%3Aconf%2B888@conference.freeswitch.org> pstn:213-799-1400
One way would be to share your patches with us. The other would be to not edit any of the files.
LOL Anthm, caustic eh! :-) Anyway the problem is that in the time it takes for me to produce an ugly patch which almost works, dozens and dozens of commits happen in your fs svn tree. You're too fast for me, or I'm just too slow. Ciao, 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. -----------------------------------------------------------------------------------------------------
I seem to recall a ssh based filesystem that probably solves all of this for you. http://fuse.sourceforge.net/sshfs.html On Jun 17, 2009, at 10:34 AM, Cavalera Claudio Luigi wrote:
One way would be to share your patches with us. The other would be to not edit any of the files.
LOL Anthm, caustic eh! :-)
Anyway the problem is that in the time it takes for me to produce an ugly patch which almost works, dozens and dozens of commits happen in your fs svn tree. You're too fast for me, or I'm just too slow.
Ciao, 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. -----------------------------------------------------------------------------------------------------
_______________________________________________ Freeswitch-dev mailing list Freeswitch-dev@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-dev http://www.freeswitch.org
You may want to use git. Have a look at http://git-scm.com/ and http://utsl.gen.nz/talks/git-svn/intro.html Regards /tyn On Wed, Jun 17, 2009 at 10:47 AM, Michael Jerris<mike@jerris.com> wrote:
I seem to recall a ssh based filesystem that probably solves all of this for you.
http://fuse.sourceforge.net/sshfs.html
On Jun 17, 2009, at 10:34 AM, Cavalera Claudio Luigi wrote:
One way would be to share your patches with us. The other would be to not edit any of the files.
LOL Anthm, caustic eh! :-)
Anyway the problem is that in the time it takes for me to produce an ugly patch which almost works, dozens and dozens of commits happen in your fs svn tree. You're too fast for me, or I'm just too slow.
Ciao, Claudio
Internet Email Confidentiality Footer ----------------------------------------------------------------------------------------------------- La presente comunicazione, con le informazioni in essa contenute e og..
_______________________________________________ Freeswitch-dev mailing list Freeswitch-dev@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-dev http://www.freeswitch.org
participants (5)
-
Anthony Minessale
-
Brian West
-
Cavalera Claudio Luigi
-
Michael Jerris
-
Tuyan Özipek