[bt-devel] How Should Patches Be Posted?

[Troy A. Griffitts]

1) Do a: cvs update -d
in the top directory of your CVS checkout.  This will attempt to 'merge'
the latest code with your code.

2) Try to build.  You may get errors because of <<<<<<<< and >>>>>>>> in
your code.  Anywhere CVS couldn't figure out how to merge it will
include both of its options in something like this

<<<<<<<<<
latest CVS code
------------
your code
>>>>>>>>>>

You will need to choose by editing the files with these markers.

The you should be able to do a: cvs diff -u > patch
and send in the patch file.

Hope this helps.

	-Troy.

Luke Mauldin wrote:
> 
> Hello I have made several modifications to the CVS version of Bibletime.  I
> have tried downloading another copy from the CVS and doing diff -urN (because
> I modified several files in several different directories) but in the output
> I get alot of "junk".  I get alot of lines added dealing with configure
> files, makefiles, etc..  How do I not compare those files and just compare
> the files that I changed to make a patch?  Or is there another "standard" way
> of making a patch for Bibletime?
> 
> Luke