Hello pigeon, John, and other git users. Everyone else can go about their business, this is not a "convert to git" speech.
We have a problem. One of the big advantages to a distributed revision control system, whether it be git or something else, is that we can all work on our own branch(es) and pull from eachother's branches. However, this ability is highly stifled by the current landscape, where each of us is maintaining his own git (or whatever - I've been using mercurial) mirror/gateway to CVS. The only way to bring changes from John Denker's "sport" branch into one of these other mirrors (as one concrete example) is to manually cherry pick the patches. This is not only error-prone, but a huge waste of disk space when we begin having 3, 4, or more repositories, working copies, etc. of the data branch. I have a proposal. We need a common repository on which to base our branches so that we can do meaningful collaboration. It needs to be simply a gateway from CVS, and should be reasonably up-to-date. It doesn't need to have (and probably shouldn't) any of our personal development branches, but should stand alone as the canonical CVS-to-git gateway. Then we will have the commonality that will make distributed collaboration possible. I would also like to see it work with both the plib and osg branches of flightgear. It may come as a surprise to some, but git-cvsimport does not get this right. Tailor does a fine job, however. Pigeon, I think you have a repository that meets those requirements, though I admit being somewhat confused by the branch naming: $ git branch -r origin/HEAD origin/cvs.osg origin/cvs.plib origin/osg origin/osg.pigeon origin/plib origin/plib.pigeon i.e. what is the difference between cvs.osg and osg? With pigeon's permission, I propose that we rebase our personal branches on the appropriate branches of his repositories (simgear.git, flightgear.source.git, flightgear.data.git). Hans ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
