On Wed, 20 Feb 2008, Kevin Jackson <[EMAIL PROTECTED]> wrote: >> Do you want me to do the merge or are you going to do that >> yourself? > > I've got the code copied across - though the merge tool didn't so I > had to do it manually. I don't suppose this matters but I'd like to > know why svn merge did nowt
Looking at your commit, you merged a bit more than just my patch from trunk. My guess is that my patch affected some of the changed lines (different Javadocs, for example) and couldn't be merged automatically because that other change wasn't present in the branch's version. We'll also need to modify the WHATSNEW file (I forgot that) and might want to add some @since tags. I'll do it in parallel on both branches, hope you don't mind. Stefan --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
