On 07/09/2007, Rafael Schloming <[EMAIL PROTECTED]> wrote: > Martin Ritchie wrote: > > On 07/09/2007, Robert Greig <[EMAIL PROTECTED]> wrote: > >> On 07/09/2007, Rafael Schloming <[EMAIL PROTECTED]> wrote: > >> > >>> QPID-573 is fixed on the trunk, BTW, so it should be a simple matter to > >>> port it to the branch. > >> OK. Are you going to merge it into the M2.1 branch? > >> > >> RG > > > > Would be good if we had a think about how we are going to maintain the > > two code lines. 0_8/0_9 and 0_10. > > > > svnmerge is going to get out of hand too quickly. I would like to > > suggest that we get attach the patches to the JIRAs that way we can > > retreive them and apply to the code. > > > > Thoughts? > > Putting the SVN revision number in JIRA should be equivalent to > attaching a patch and possibly a bit easier. That's what I did for QPID-573.
Indeed, as long as we are quite strict with ourselves at only fixing one JIRA per commit. I know in the past that I've been guilty of fixing a bunch of issues in one commit. Makes it hard to know what relates to what fix. > --Rafael > -- Martin Ritchie
