Following some additional testing, I have moved the merged code to be the trunk. Hey, it may not work (or might ;-)), but it is better than the old trunk.
OK, so everyone should run svn switch to repoint your checkout, or do a fresh one if you haven't grabed this before. This should be the new trunk for development. No more branch_2_1_fcs stuff. :-) Jason, feel free to run: svn cp \ https://svn.apache.org/repos/asf/james/server/trunk \ https://svn.apache.org/repos/asf/james/server/branches/imap-dev and use that as your basis. You can then do: svn cp \ https://svn.apache.org/repos/asf/james/server/tags/pre-v2and3-merger-tru nk/proposals/ \ https://svn.apache.org/repos/asf/james/server/branches/imap-dev Or similar. Or ask me, and I'll set it up for you. Just please, everyone, remember to use svn cp when copying, so that we preserve history and trail. --- Noel --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]