Replies inline: On Thu, Jul 17, 2014 at 12:36 PM, Hans Rosenfeld via illumos-discuss < [email protected]> wrote:
> 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? > Yes. Basically I did "git checkout -b mdocml-1.12.1; cd usr/src/cmd; tar xf /tmp/mdocml-1.12.1.tar.gz; mv mdocml-1.12.1 mandoc; git add mandoc; git commit -m "Initial import of mdocml 1.12.1" (The exact commands were slightly different, but the net effect was the same as above.) > > 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? > Its better from the perspective that someone looking only at the trunk only sees complete and well formed integrations, which follows our existing rules. At no time will, for example, the main tree be in a state where findunref would report huge swaths of code which have no functional purpose in the tree. I don't think there will be that many branches, because we don't have that much externally maintained code. But anyway *BRANCHES ARE CHEAP IN GIT*. So, who cares? I'm not proposing a process that would create thousands of branches -- at most a dozen or so I think. Even a few dozen is no big deal. - Garrett > > ------------------------------------------- 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
