Giorgos Keramidas writes: > On 2007-06-20 08:13, James Carlson <[EMAIL PROTECTED]> wrote: > > - finally, the updated merge workspace is resynced with the > > project gate ("pull") and putback ("push") there. > > Ah, yes, indeed. I forgot the second reparenting to the gate and the > final bringover/putback.
There's some iteration due to drift in the gates while the merge work (and testing) is being done. If you can lock down the project gate while you're doing the merge, you can avoid the problem. But it's usually not necessary to do this, and it's much friendlier to gatelings if you can avoid locking anything down. So, that last step can actually expand to pulling in more people again if the "wrong" files were touched by someone on the project in the middle of the operation. :-/ > Thanks for the outline. > > I guess now we can email the Hg developers with something which > resembles a sort of functional requirements list :-) That's good to hear! -- James Carlson, Solaris Networking <[EMAIL PROTECTED]> Sun Microsystems / 1 Network Drive 71.232W Vox +1 781 442 2084 MS UBUR02-212 / Burlington MA 01803-2757 42.496N Fax +1 781 442 1677 _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org