So after review comments, my changes look like this: http://cr.opensolaris.org/~mjnelson/webrev.nightly.2/
...which is an incremental change like this from the first webrev: http://cr.opensolaris.org/~mjnelson/webrev.nightly.1-2/ > Mike> Maybe the references should all be changed to $CLOSEDSRC (or some > Mike> other appropriately named and initialized variable)? > > Mark> Seems reasonable, though it would probably be CLOSEDROOT or > Mark> somesuch. > > Well, as Rich (?) pointed out, people are likely to associate > "CLOSEDROOT" with the proto area, not the source tree. Yeah, since I only missed two previously, I went ahead and stayed with $CODEMGR_WS/usr/closed for these. > Mike> Second issue: can you show an example of the mail message with the > Mike> new merge warning/error messages? > > Mark> Attached. > > Thanks. I'll see if I have time to look at it tomorrow morning; > otherwise it'll be Friday. OK, thanks. I'm hoping to do a putback tomorrow, because these problems have already interfered with workspace conversion. (It's why I targeted a teamware putback instead of pushing it to our project repo.) So essentially I'm punishing folks who follow my urgings to "convert now!" > Mark> Neither message will appear in the nominal (no merge required) > Mark> case. > > Mmmm, I'd expect the successful merge (commit needed) path to be > traversed a lot. Won't it get triggered if *anyone* has done a push > after the user's most recent pull? I still have it in my head that using nightly to do automated bringovers into a workspace known to have local changes is not common practice. --Mark
