On Feb 7, 2011, at 11:16 AM, Max Horn wrote: > (e.g. I imagine that 10.4/stable, 10.5/unstable, etc. could be a > separate branch each, and we'd have multiple "checkouts" for each > inside /sw/fink/dists)
I forgot to mention, multiple branches are handy when you want to move a revision of a package from stable to unstable. You can import the history of unstable as a "remote" of stable, and do something like "git cherrypick -x <commit>" to promote a new rev of a package to stable (including changes like adding or removing .patch files). The only slightly non-intuitive part (I've tried this on my local Git tree) is that stable and unstable won't have a common ancestor. If you're used to seeing the Git status message "This branch is X commits ahead of 'origin'", it won't be feasible in this case. Even if you merged the two trees and backed out the deltas, the minute someone commits something to unstable, the stable branch will start to diverge. I don't think this is a big deal, though. We've survived several years with separate commit logs for stable vs. unstable packages. I suspect that the history for e.g. 10.5/unstable vs. 10.6/unstable might be close enough to make this worthwhile, though (to see where a package started to diverge between OS versions, for instance). ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-devel
