Move branches/paulRefactor to trunk.
Ed, you may want to copy your working tree and do a new checkout, in case you have local changes since your last commit.