inline...
On Thu, Jul 17, 2014 at 1:31 PM, Hans Rosenfeld via illumos-discuss < [email protected]> wrote: > On Thu, Jul 17, 2014 at 12:43:51PM -0700, Garrett D'Amore via > illumos-discuss wrote: > > 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.) > > Ok, I understand, I see how this would work. Is git smart enough to > show renames as you did them for mandoc? > > Yes. Its how I generated the webrev, in fact. > > > > 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. > > Well, findunref would be the only problem one sees when building at the > exact changesets of the integration. > > > 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. > > I could imagine this getting out of hand over time. Like, I might want > to use it for the drivers I recently received from Emulex (two more > branches, for emlxs and oce), and maybe also for the BSD iwn driver I've > been working on recently. There is really a lot of stuff we take in from > outside sources, not just software packages like mandoc and OpenSSL. > Not all of it has to be tracked this way. Very few drivers should be tracked this way for example. > > > Even if we cleanup old branches on new integrations of the same code, I > wouldn't be surprised if we had a 100 branches within a few years. At > least they are reasonably lightweight :) > So, 100 branches, no big deal. > > > Anyway, this resolves my main concern -- that information about the > changes made to foreign sources at import time are lost. Will we start > doing this now, with mandoc and OpenSSL? > I'm willing to. I don't have a strong opinion about it one way or the other. I think I can reasonably create the branch now without triggering a need for developer council review. :-) Any objections? - Garrett > > Hans > > > -- > %SYSTEM-F-ANARCHISM, The operating system has been overthrown > > > ------------------------------------------- > illumos-discuss > Archives: https://www.listbox.com/member/archive/182180/=now > RSS Feed: > https://www.listbox.com/member/archive/rss/182180/22003744-9012f59c > Modify Your Subscription: > https://www.listbox.com/member/?&; > Powered by Listbox: http://www.listbox.com > ------------------------------------------- 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
