Date: Wed, 07 Jan 2009 07:35:33 +0100 From: Peter Boosten <peter@boosten.org> To: Yuri Pankov <yuri.pankov@gmail.com> Cc: freebsd-questions@freebsd.org, Johann Hasselbach <jhass88@gmail.com> Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 Message-ID: <49644D35.5020103@boosten.org> In-Reply-To: <20090107061339.GB12584@darklight.homeunix.org> References: <ab52c4f40901061328i254481d9obb36bcf53757d7db@mail.gmail.com> <4964467D.9020606@boosten.org> <20090107061339.GB12584@darklight.homeunix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Yuri Pankov wrote: > On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: >> >> Also: most scripts updated by mergemaster during 7.0->7.1 are only >> version numbering diffs. Is there no smarter way to do this, apart from >> typing 'i' every time? > > I think you want -U option (auto upgrade files that have not been > modified by user) along with -i (install missing files). After reading the man page the -s option seems to be more appropriate (unless I misread that bit, of course :-) ). Peter -- http://www.boosten.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49644D35.5020103>