Date: Wed, 31 Oct 2012 08:30:29 +0100 From: Andreas Nilsson <andrnils@gmail.com> To: Glen Barber <gjb@freebsd.org> Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org> Subject: Re: make release fails on find Message-ID: <CAPS9%2BSt2O3Xc3OKy4i9Y-z2QeB6HEY5WL6m7_mvCWfhxt7bXqA@mail.gmail.com> In-Reply-To: <20121031033519.GI1371@glenbarber.us> References: <20121030160804.GB1371@glenbarber.us> <CAPS9%2BSsUijoe6-4mY-LeZAP4geRG_KfObwtWJxP_0=Dkm9bW4Q@mail.gmail.com> <20121030170916.GD1371@glenbarber.us> <CAPS9%2BSuLH0Q%2BxPVHCEHuSEnPTpTsKs0YOnNkxgav-ppQDg%2BvVQ@mail.gmail.com> <CAPS9%2BStn30yqnPaZRu7mY8NXExgr5vTDbmdGNmD2%2B_xfmmdTEg@mail.gmail.com> <20121030231412.GE1371@glenbarber.us> <CAPS9%2BSuASy6ojFaLkTe3e54qeHt8HdQ%2BgvYwgr%2Bi7zXcYdsLFg@mail.gmail.com> <20121031001115.GF1371@glenbarber.us> <20121031030724.GG1371@glenbarber.us> <20121031031912.GH1371@glenbarber.us> <20121031033519.GI1371@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Oct 31, 2012 at 4:35 AM, Glen Barber <gjb@freebsd.org> wrote: > On Tue, Oct 30, 2012 at 11:19:12PM -0400, Glen Barber wrote: > > So, please also do: > > > > svn merge -c241451 ^/head/release release > > > > You'll want to merge one more revision: > > svn merge -c241596 ^/head/release release > > Same as before - I _think_ this should work. :-) > > Glen Excelent :) That did the trick, ie no recursion :) Thank you very much for finding the bugs. Will this be merge to 9-stable? On a more whislist topic: I'd really appreciate if .zfs dirs would be excluded from the tarballs. Best regards Andreas
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPS9%2BSt2O3Xc3OKy4i9Y-z2QeB6HEY5WL6m7_mvCWfhxt7bXqA>