On Mon, Sep 15, 2014 at 7:37 AM, hasufell <hasuf...@gentoo.org> wrote: > * repoman must be run from all related directories (or the top-level > directory) on the latest commit that is being pushed
This should be clarified. Does repoman need to be run on the exact commit that is being pushed, or perhaps on a "parent" commit prior to rebasing/merging into the master branch? (I use parent liberally here, since that commit wouldn't be an actual parent if it were rebased.) The reason I ask is that repoman takes a while to run (especially on the full tree), and if we don't want non-fast-forward pushes then you'll have to keep repeating the pull ; merge ; repoman ; push cycle until you finally complete it in less time than it takes somebody else to do a push. Today people do not run on the tree as it exists the instant before commit because cvs makes no guarantees about tree consistency at all (basically cvs is like git configured to accept non-fast-forward commits). > > == branching model == > > * the primary production-ready branch is master (users will pull from > here), there are no non-fast-forward pushes allowed > * there may be developer-specific, task-specific, project-specific > branches etc (there are currently no specific rules about them) I suggest we at least toss out some kind of naming convention to prevent chaos. How about dev/<name> as the namespace for devs acting as individuals (devs can do whatever they want below this), and project/<name> as the namespace for projects (which can also do whatever they want below this). If we missed anything devs should discuss on-list before just creating random branch names. I don't really want to contrain what people do here - just try to organize it at least a tiny bit. -- Rich
