http://cr.opensolaris.org/~mjnelson/webrev.nightly/
I have tested both portions of this fix as follows: - for the bringover of usr/closed, I instrumented nightly to fail after the repository initialization and before the bringover, and tested with no existing repos, only open, and both, all with CLOSED_CLONE_WS set. - for the merge, I set a POST_BRINGOVER hook to stop the build and created simple, nested repositories. I created conflicting merges in one and nonconflicting merges in the other, then vice versa, and made sure that bringover failed naturally (rather than as a result of the hook) in both cases. I also checked the repository state against what was described in the messages. --Mark
