On Apr 28, 2011, at 2:48 AM, Fredrik Öhrström wrote: > I think it is much better to use the rebase extension to do > hg pull --rebase
Repo history is simplified if individual developers (a) delay commits and merges and (b) minimize private merges. For my part, I use mq to manage my bug fixes in patch form, all the way up to the final push (or jprt job). If the push fails for some reason, I reapply my patch and remerge. There are no stacked merges. In most cases, any push requires at most one merge. Maybe jprt will throw in another merge, sometimes. > Assuming that you have a large number of committers at work at the same time, > a simple solution > is to have the committers add themselves to a queue, then they get a message > (IM,mail or otherwise) > when they have exclusive access. When they are done, they relinquish their > exclusive acces or > it will be revoked automatically after 5 minutes. If there is a critical section, it has to be long enough to allow relevant pre-integration testing. For hotspot development, this means a jprt run. For small fan-in situations (like Kelly noted), optimistic concurrency works very comfortably, without lock negotiation. (Does anyone remember the days of using stuffed animals for source control locks? I wonder what is the internet version of that. Probably what Fredrik said.) -- John
