Michael Jakl wrote: > Hi! > > On Wed, Apr 22, 2009 at 10:13, Bernd Fondermann <[email protected]> wrote: >> So, I propose to attach patches to JIRA (more than one patch per JIRA, >> where appropriate) for the time being. At some point you may gain >> committership (that's not my call, but the MINA PMCs, so I can be open >> about that), but that's probably some month of work away. >> >> What do you think? > > This was the default anyway, I was just wondering if there is a better way. > > I have a few questions, though: > > How do we deal with dependent patches? Say I'm introducing some sort of > factory > (Patch1), and later I'm using the factory for some feature (Patch2). How do we > make sure these are applied in the right order?
Numbering? > Is there a naming convention for patches? Not yet. I'd propose to number them for each JIRA and dot.number them for later revisions of the same patch, like JIRA-234 1 JIRA-234 2 (complementary to 1) JIRA-234 1.1 (replaces 1) > Won't I have conflicts if I patch something and check out the HEAD after the > patch is applied? you mean "svn update to HEAD"? No, if you update to what you already have, no. If you made conflicting changes, you'll have to merge. (Please note: You have to merge, not everyone else ;-) ). Shouldn't be a problem. Let's address it when it gets a problem. > Is there a standard way to stay up to date without having conflicts? What > would > you recommend? Bug me into applying patches soon. :-) Bernd
