From: Grant I. <gsi...@ap...> - 2008-08-01 20:38:01
|
Inline... On Aug 1, 2008, at 3:36 PM, Antoni Mylka wrote: > Just to let you know. I've reverted the revision 1377. The trunk is > as stable as it was before. I'm investigating ways to make the patch- > commit setup as painless as possible. Right now the workflow would be > > Generating a patch > 1. right click on the project -> team -> create patch > 2. click save in the filesystem > 3. type the name > 4. click next > 5. click generate > 6. log in to sourceforge > 7. navigate to the corresponding issue > 8. scroll down to see the field with "Add attachment" > 9. click "browse" > 10. find your patch in the correct folder > 11. upload it to the issue > > Applying > 1. get to know that there is a patch worth reviewing > 2. navigate to the corresponding issue > 3. scroll down to the attachments > 4. right click the attachment and go to Save file as > 5. save the file in a known folder > 6. in eclipse right click on the project and go to team apply patch > 7. click file > 8. click browse > 9. find the file in the browse window and click ok > 10. click next > 11. click next once more (resolve conflicts) > 12. click finish > > Grant, is that the way you work? I'm a command line kind of guy for this stuff. I've often found I make more mistakes when using the IDE. Here's my typical flow after making my changes in the source: Creating a patch from base dir: ant clean test svn status svn diff > ISSUE-XXXX.patch //actually, I usually save them in ../ patches/ISSUE-XXXX.patch so as not to pollute the tree and always keep them in a designated place Attach to Issue Applying patch from base dir: patch -p 0 -i <path to patch> --dry-run //see if there are any issues, just makes it a little bit easier to deal with if there are, since they aren't applied patch -p 0 -i <path to patch> Review the patch, update CHANGES svn ci -m "ISSUE-XXXX: fixed the problem with the widget" The one caveat is you have to make sure, no matter how the patch is generated, that it is clear where to apply it. Cheers, Grant |