I have a branch with many changes. I\'ve merged trunk to it, and now have working copy state equivalent to trunk with my
