Date: Mon, 18 Aug 2008 07:07:45 -0700 From: Julian Elischer <julian@elischer.org> To: Marko Zec <zec@freebsd.org> Cc: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, freebsd-virtualization@freebsd.org Subject: Re: Next p4 integ for vimage branch Message-ID: <48A98231.2080503@elischer.org> In-Reply-To: <200808181219.20045.zec@freebsd.org> References: <200808181219.20045.zec@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Marko Zec wrote: > I'm half through resolving the conflicts there and probably won't be > done with this until tomorrow afternoon after returning home. Will do > the others branches after vimage integ is done. > > Marko commit3 should not be a problem since it is based off commit2 I was going to offer to help with vimage-commit however is base of 'vimage' so merging vimage should allow you to to vimage-commit by cross itegratingthe changes.. then cross integrating between vimage-commit and vimage-commit3 should be possible to merge them.. (the reason that vimage-commit and vimage-commit3 both exist is as a check on eaxh other.. vimage-commit is a cut-down version of vimage, while vmage-commit3 is a built up version of vimage-commit2, but they shuld contain about the same information.. it was my way of comparing 'vimage' with the (originally) machine generated vimage-commit2. so if we merge -current into vomage, teh same changes should also apply into vimage-commit. which should then become very close to vimage-commit3. I vwould then merge those two, and call that teh next commit in other workds I think the next commit candidate (which will still make no actual change to the binaries should be the integration product of vimage-commmit and vimage-commit3 both of which should have been updated to take into account the commit just done. that will be "just about everything else we can do without changing hte binary". I think this should eb the aim of the next commit. "get as much in as we can without actually doing anything" it massively reduces teh diff and puts us in a really god possition for having the MEAT of the diff more visible and available for review. it will also make the differences with Jamie more clear.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48A98231.2080503>