Hi, > I did a full checkout of trunk, and merge no longer gave that error but it > took so long it timed out. Looks like if you check out on people.a.o it works, I'll do a merge, check in and tag. Anything that in conflict I'll take the the release version (there a few things).
Thanks, Justin
