Date: Fri, 5 Feb 2010 09:36:08 -0500 From: John Baldwin <jhb@freebsd.org> To: freebsd-acpi@freebsd.org Cc: Andriy Gapon <avg@icyb.net.ua> Subject: Re: acpica in stable/8 Message-ID: <201002050936.08434.jhb@freebsd.org> In-Reply-To: <4B6BD8B2.2060504@icyb.net.ua> References: <4B6BD8B2.2060504@icyb.net.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 05 February 2010 3:37:06 am Andriy Gapon wrote: > > I would like to bring version of ACPICA in stable/8 to that of head, that is > 20100121. > > Here's svn status and svn diff outputs for the merge: > http://people.freebsd.org/~avg/stable-8-acpi.status.txt > http://people.freebsd.org/~avg/stable-8-acpi.diff > > I've performed this MFC by doing series of svn merges first to sys, then to > usr.sbin/acpi. I hope that this is a correct approach. > I have some doubts because of heard suggestions that such merges should be done > from vendor area. But, OTOH, in head there were direct commits sys to fix > consequences of merge from vendor area. > Subversion gurus, please advise! You should just MFC the changes from HEAD. You should not merge from the vendor branch directly into a stable branch. The only time that would be appropriate would be to merge a vendor change into a stable branch that was never merged to HEAD (e.g. if some vendor software 'foo' was upgraded from version 1 to version 2 in HEAD but was version 1 in a stable branch and later a patch release 1.1 that fixed a security bug came out, then 1.1 would be imported into the vendor area and directly merged to the stable branch). -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002050936.08434.jhb>