Committer workflow [was: commit: Fix specifier inheritance behavior]

Didier Verna writes: I work this way too. But this is an annoying, CVS-like way to work. And I see no easy way to enforce it (see below, however). Working that way is what most people consider the main advantage of modern VCSes, and Mercurial is designed to make it especially easy. What we should have done, I think, is to use a DAG-oriented VCS, I'll use git below because it makes sense to me, and had a commit hook that automatically rebases. Then the workflow in the usual case would be committer$ git push my-topic-branch:temp-branch commit-hook$ git rebase --onto master master temp-branch commit-hook$ git diff -r master -r temp-branch | send-commit-notice commit-hook$ git checkout master commit-hook$ git pull . temp-branch commit-hook$ git branch -D temp-branch and in the conflict case committer$ git push my-topic-branch:temp-branch commit-hook$ git rebase --onto master master temp-branch commit-hook$ git rebase --abort commit-hook$ echo "Try, try again!" | send-commit-notice commit-hook$ git branch -D temp-branch At times of low code churn, this would work pretty much as currently, except that we'd automatically get sane commit notices, and there would be no merge turds in the public history (all of the pulls would be fast-forwards by construction). At times of high code churn, people who did the rebasing locally would have a big advantage in getting their stuff safely committed. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches