On Wed, Jul 16, 2014 at 03:57:48PM -0700, Garrett D'Amore via illumos-discuss wrote: > I think you forget that we have the ability to create branches. Having a > single "clean" integration on the main trunk doesn't preclude us from using > tracking branches for third party software. This can make it easy for > folks to perform diffs, reintegrate, etc. I feel very strongly that we > should not break our "1 commit per bug" policy on the main trunk. > > The rest of the information can be made trivial available in the branches. > For example, I created a local branch called mdocml-1.12.1 reflecting my > integration of mdoc-1.12.1 solely. I'd be happy to push that branch up to > the main repo, so other people could see it, and future maintainers could > use it when figuring out how to merge against newer versions of the > upstream.
Just to make sure, are you suggesting we slowly acquire branches for each external package (I'm not talking about packaging here)? I'm not really thrilled with the one-commit rule when it comes importing external code. It only leads to "what changed here" questions. Just look at SunSSH or any other Sun-imported code. An alternative (really a combination of yours and Hans's thoughts)... git submodules: they'd let other branches be checked out in assorted places within the illumos-gate repo. Jeff. -- Bad pun of the week: The formula 1 control computer suffered from a race condition ------------------------------------------- illumos-discuss Archives: https://www.listbox.com/member/archive/182180/=now RSS Feed: https://www.listbox.com/member/archive/rss/182180/21175430-2e6923be Modify Your Subscription: https://www.listbox.com/member/?member_id=21175430&id_secret=21175430-6a77cda4 Powered by Listbox: http://www.listbox.com
