To test my understanding, the way to apply a patch is 1. Make sure you have a current working copy (i.e., do an SVN Update to your working copy first).
2. Apply the Patch in your working copy using whatever Merge tool you like. This will leave updates in your working copy, unless the patch has already been applied or you decide not to merge for some reason. Assuming there is a change, 3. Do whatever else is needed to identify the patch and contributor. 4. Do a commit. Make a nice commit message. (This is the scary part - I haven't run into a collision yet, so I don't know what happens.) 5. If SVN says there is a conflict, now figure out what to do. I don't know what happens if you pull another Update, considering you have an unsuccessfully-changed version in your working copy. (I am trusting that TortoiseSVN will help not lose those changes, but I don't know yet.) - Dennis -----Original Message----- From: Marcus (OOo) [mailto:[email protected]] Sent: Friday, June 24, 2011 11:18 To: [email protected] Subject: Re: [PATCH] Corrected two typos on website Thanks for the fix. :-) As I don't know yet how to add a patch to SVN, I've corrected the text directly. I hope it's OK for you. Of course I've mentioned you in the commit message. Marcus Am 06/24/2011 07:55 PM, schrieb Dick Groskamp: > Trying to get the hang of it. > > Just fiddling around for the moment
