On Thu, 3 Jan 2013, John Peterson wrote: > It's an alternative to doing periodic merges (as e.g. Ben did with his > recent meshfree interpolation branch).
Yup. And even with things like "git log --no-merges", the result of those seems to be slightly annoying. When experimenting with "master adds A, branch adds B, then we merge" the other day, I ended up with a final history that looked to git diff something like "add A, then remove A and add B, then add A again". It looks like a simple rebase of the form Derek suggested would fix that. > But note that periodically rebasing a shared branch should probably be > frowned upon, since that involves rewriting history (and push -f), and > may affect others... This is half of my trepidation. Before using git, in my imagination *every* branch was a shared branch. E.g. suppose I'm futzing with hierarchic model refinement, Paul is trying to get anisotropic h refinement working, and I want to periodically check that my stuff doesn't break his or vice versa. Doesn't that become harder if our branchs' revision history isn't actually our branchs' revision history? > I looked at this diagram for a while, and I like it, other than I > probably wouldn't make such a big distinction between the yellow and > green dots... I like separating development vs. release-candidate branches. It seems like an improvement over our traditional "okay, nobody commit any big new features for a month while we get everything ready for release" announcements. Of course, as long we can afford to regularly buildbot/trac every test we have then there's not much of an issue because we'll be able to keep development continuously at maximum "readiness", but I've got some long-term ideas for increasing our test coverage exponentially - good for hammering on the code as much as possible every now and then (and for preemptively catching the kinds of "only occurs in 3D on 24 processors" bugs we've previously only found when an application hit them), but well beyond what we'd want to have to run before every push to the main development branch. --- Roy ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_122712 _______________________________________________ Libmesh-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
