[Freeswitch-dev] what's the best way to change code and make patch
dujinfang at gmail.com
Fri Jul 31 19:51:41 PDT 2009
Thanks Brian. But what if the 2 changes are on one file?
svn diff file.c > patch1.diff
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 ...
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
> On Jul 31, 2009, at 3:42 PM, Seven Du wrote:
>> 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.
> FreeSWITCH-dev mailing list
> FreeSWITCH-dev at lists.freeswitch.org
More information about the FreeSWITCH-dev