On Fri 15 Jun 2007 at 04:08PM, Mike Kupfer wrote: > >>>>> "Rich" == Richard Lowe <[EMAIL PROTECTED]> writes: > > Rich> For the sake of my reasoning, why do you want to quit in the > Rich> middle and resume? > > I've personally run into these two cases: > > 1. you start working on it at the office, then it's time to leave for > dinner, and you want to finish at home. > > 2. large projects often have a designated gatekeeper who does most of > the merges, but occasionally she needs to call in an expert to deal > with a particularly hard file.
Absolutely. When we were doing zones development (zones had its tentacles all over the kernel) there were occasionally some very complex merges with things like TCP/IP. In an average sync up there would be 75-100 files with conflicts, and one or two which would be a significant challenge. Teamware let me hand over to the engineers with greater expertise than I (I was keeping the gate) to ensure that we got the merge right. IIRC, with teamware you can even take a child and do the merge there, but I forget exactly the mechanics of that. -dp -- Daniel Price - Solaris Kernel Engineering - [EMAIL PROTECTED] - blogs.sun.com/dp _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org