On Mon, Sep 05, 2011 at 03:21:25AM +0200, Kai-Martin Knaak wrote: > Proposal to tone down the impact of patches breaking important features: > > Add a branch "test" to git. This branch would work pretty much like > sid/unstable repo of debian. It would receive all the new stuff so > advanced users like me can give them a test run. > If a patch stands the test by same time, it will be applied to git-head. >
My thoughts on this: This sounds like a good idea, but depends on developer availability (who will move features from testing to master?), and would probably end up being of limited usefulness. My mil-to-nm changes and Peter C's rendering/cleanup changes have both been so intrusive that any "minor" changes applied after-the-fact, would simply not apply without those changes. So they would be stuck in testing for as long as mil-to-nm is. (To see this, run git diff 4d239d98 master --stat which gives 252 files changed, 25069 insertions(+), 13260 deletions(-) !) In the case of my metric changes, it might have been smart to tag a revision before the crazy changes, so that you would have something to compile without the breakage. As it stands, the actual conversion (i.e., the hardcoded-constant changes) should all be in commit 97b3260ec. So you might want to just checkout your own branch with this reverted, and rebase any new changes against that: git checkout -b kai_no_metric git revert 97b3260ec Then to update: git pull origin master git rebase master -- Andrew Poelstra Email: asp11 at sfu.ca OR apoelstra at wpsoftware.net "Do whatever you want. Do what you think is important. Everybody is an individual." --Ron Paul _______________________________________________ geda-user mailing list geda-user@moria.seul.org http://www.seul.org/cgi-bin/mailman/listinfo/geda-user
