Push races

[Mads Kiilerich]

On 09/26/2012 08:45 PM, Roger Kratz wrote:
> Hi
>
> We are around 25 developers using Hg as a VCS for our software. We have a main repo with ~3 live named branches/releases. New features are created on separate clones. Bugs are corrected on main on the "oldest" release and then merged to newer releases and default.
>
> Bugs tends to be reported many at a time (we have internal "test days") and therefore bugs tends to be solved concentrated to a few days a month. Often this leads to "push races", developer A and B (and maybe C) tries to integrate their bug fixes (while locally merging the fix between the release branches) at the same time. This may lead to a "push race" and developer needs to pull down latest and do the merges between the named branches again.
>
> How do you other hg users solve this in mid sized (or large sized) companies? The daily work with PBI:s is, as said, done on separate clones which pretty much eliminates this problem - but how about bugs?

One solution to that is to change to using a pull based work flow. 
Something where developers publish their changes somewhere, and where 
one build/release manager pulls and merges (or rebases) them to the 
final destination one by one. That also makes it easy to introduce some 
QA/testing/review process.

/Mads