On 07/09/2007, Robert Greig <[EMAIL PROTECTED]> wrote: > On 07/09/2007, Martin Ritchie <[EMAIL PROTECTED]> wrote: > > > 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. > > I agree with the earlier comment about just knowing the svn commit number. > > But the main question about managing the two code lines: > > I think we need to accept the the 0-8/9 codebase is going to live for > another year. From what I understand (and correct me if I am wrong) > the 0-10 changes are more focussed on the lower layer rather than for > example the broker. Therefore I think that developers must merge > changes into both streams where possible.
"Leaving it until "later" will as you say become unmanagable." That is so true! IIRC we have both had huge merges to do and SVN really isn't the tool for it. > > RG > -- Martin Ritchie
