Thanks Brian. But what if the 2 changes are on one file? change 1 svn diff file.c > patch1.diff revert file.c change 2 svn diff file.c > patch2.diff patch < patch1.diff Then I got 2 patch files and 2 changes reminds on my code. But it will be more complicated if I more than 2 changes. Also I have to re-diff if I want to change change1 ... 7. On Aug 1, 2009, at 4:52 AM, Brian West wrote:

svn diff path.tofile.c > patch1.diff svn diff path.tootherfile.c > patch2.diff

/b

On Jul 31, 2009, at 3:42 PM, Seven Du wrote:

...

Hi,

Let's say I made 2 changes to one file, and svn diff can generate one diff file, but I want two changes in different patch files so developers may apply both or only one to trunk.

The simple way would be do only one change one time, but that one might be take time or never to be applied into trunk, this makes complicated to maintenance code.

The other way maybe to make a branch, but takes extra works to keep sync with trunk.

Ideas?

Thanks.

_______________________________________________ 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

If you use git locally with git-svn you can do this. git add -i Mike On Jul 31, 2009, at 10:59 PM, Brian West wrote:

oh that sucks... you'll have to do them differently.

/b

On Jul 31, 2009, at 9:51 PM, Seven Du wrote:

...

Thanks Brian. But what if the 2 changes are on one file?

change 1 svn diff file.c > patch1.diff revert file.c change 2 svn diff file.c > patch2.diff

patch < patch1.diff

Then I got 2 patch files and 2 changes reminds on my code. But it will be more complicated if I more than 2 changes. Also I have to re-diff if I want to change change1 ...

7.

_______________________________________________ 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

On Aug 1, 2009, at 1:00 PM, Anthony Minessale wrote:

dont forget to propose what you are patching so we all approve of it if you plan to re-submit.

Thank you Anthony, I'd like to ask this question even no patch :) Just like this one: http://jira.freeswitch.org/browse/MODENDP-236 And I'm thinking to add a little more statistic messages to profile and gateways. While profile has failed calls stat, gateways don't. And something like number of failed calls in the last 5 minutes or number of continuously failed calls, and might be fired to event socket to do smart routings. Sure it's easy to listen to the event socket and do whatever we want, some features are better to be built in. Anyone think we need a built in statistic Mod to generate reports on resource usage statictics? Another one would be api to remove a fifo node from memory. OK, another question, if, just if I have code in branch, can it be directly merged to trunk without a jira? Thank you.

On Fri, Jul 31, 2009 at 10:34 PM, Michael Jerris <mike@jerris.com> wrote: If you use git locally with git-svn you can do this.

git add -i

Thank you Michael I think that works.