Date: Wed, 7 Jan 2009 01:24:02 -0500 From: Robert Huff <roberthuff@rcn.com> To: Yuri Pankov <yuri.pankov@gmail.com> Cc: Johann Hasselbach <jhass88@gmail.com>, freebsd-questions@freebsd.org, Peter Boosten <peter@boosten.org> Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 Message-ID: <18788.19074.638345.767831@jerusalem.litteratus.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 writes: > > 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). How does it deteremine what's been user-modified? I've got a few things that have local edits that, for reasons of laziness, still have the same version tag. Robert Huff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18788.19074.638345.767831>