[Freeswitch-dev] what's the best way to change code and make patch

[Seven Du]

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.