On Wed, Apr 24, 2013 at 7:47 AM, Michael Mol <mike...@gmail.com> wrote: > > 13. Gerrit's push to tree fails, since tree with changeset A isn't in > changeset B's ancestry. >
Honestly, this is a problem with any use of repoman with git unless you let the server auto-merge trivial changes. Cvs tracks commits at the file level, and git does it at the repository level. The chances of somebody modifying the same files in the time it takes you to stage, test, and commit a change in cvs are fairly low. The chances of somebody making any commit to the repository in the time it takes you to rebase, do a repoman check, and push are much higher. We might have to live with repoman being a manual process - then you'd just pull/rebase-or-merge/push to get it to the tree and use your brain to determine if it causes any problems (which does require responsibility). However, your specific example could be modified a bit to make it more robust: 1. Dev A pulls from tree 2. Dev A merges those changes with his local copy of tree 3. Dev A pushes to Gerrit 4. Gerrit begins tests on changeset A 5. Dev B pulls from tree (or perhaps he pulled earlier) 6. Gerrit is still testing changeset A 7. Dev B merges those changes with his local copy of tree 8. Gerrit finishes testing, pushes to tree 9. Dev B's push to Gerrit fails, since Gerrit's head isn't in B's ancestry. 10. Dev B pulls, rebases, and re-pushes - possibly pulling directly from Gerrit to reduce latency. It still fails when you get high volumes, because the fundamental issue is that it can only handle as many commits as Gerrit can test in a given period of time, plus various latencies. Rich
