I've submitted patches to open source projects using TortoiseSVN. Pretty straight forward once you get the hang of it. Two problems though:
First, I update to the trunk, write some code to add a new feature, create and submit a patch. Life is good. I then proceed to add a second feature before the first feature has been reviewed and committed. How can I create a patch that is independent of the first patch? What if the first patch is rejected or the second patch is for whatever reason applied before the first one I submitted? This wouldn't really be a problem unless both patches affect the same files. And when adding new .cs files, the project file will always be affected. Does anyone have any suggestions to help with this scenario or is this just a fact of life?
Second, I submit the patch, it is accepted and committed. When I then update (using 'SVN Update' from the Explorer context menu) to the trunk I always get conflicts saying that the new file already exists or is marked for 'Add'. Am I mis-using TortoiseSVN? I end up having to delete the files that were part of the patch, then re-updating for the files to correct themselves.
Thoughts or suggestions are most appreciated.