On Thu, Jul 17, 2014 at 12:27:43PM -0700, Garrett D'Amore wrote: > To answer your trivially: git diff -r <cset1> mdocml-1.12.1 > > The precise value of <cset1> will be the changeset where I push the > combined change. > > (mdocml-1.12.1 is a git branch, which is just like any other change set > except that it has no direct descendants, except perhaps further > integrations of mdocml-1.12.2, etc.)
I'm still not sure I fully understand. What exactly is in the branch? Is it a true branch of illumos-gate, which just happens to have an unmodified mdocml-1.12.1 where the combined change is in master? And how exactly is having a branch containing the commit of the unmodified bits better than having a commit in master? How many branches will we end up having if we do that for every piece of externally maintained code? Hans -- Hans Rosenfeld Software Engineer, Nexenta Systems Inc. Phone: +49 1577 9769494 -- Skype: hans.rosenfeld.99 ------------------------------------------- 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
